Move subarch and machine map information to variables at top of each arch module...

diff --git a/ChangeLog b/ChangeLog
index 6d4aff8e09e69177667bc21f76013976f621898c..e4f809bff98b8285f1a054030a784446a13342a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 
+  11 Jan 2009; Andrew Gaffney <agaffney@gentoo.org>
+  modules/catalyst/arch/alpha.py, modules/catalyst/arch/amd64.py,
+  modules/catalyst/arch/arm.py, modules/catalyst/arch/hppa.py,
+  modules/catalyst/arch/ia64.py, modules/catalyst/arch/mips.py,
+  modules/catalyst/arch/powerpc.py, modules/catalyst/arch/s390.py,
+  modules/catalyst/arch/sparc.py, modules/catalyst/arch/x86.py:
+  Move subarch and machine map information to variables at top of each arch
+  module and get rid of register() function
+
   11 Jan 2009; Andrew Gaffney <agaffney@gentoo.org> ChangeLog:
   Add catalyst.util.load_module() function
   Move arch modules under modules/catalyst/arch

diff --git a/modules/catalyst/arch/alpha.py b/modules/catalyst/arch/alpha.py
index 3fd9b3db1124d3639dedcc7671c79b94934a54d0..b700392856dc4396c3919ed0f5f39c3e00a4b955 100644 (file)
--- a/modules/catalyst/arch/alpha.py
+++ b/modules/catalyst/arch/alpha.py
@@ -2,6 +2,19 @@
 import builder,os
 from catalyst_support import *
 
+__subarch_map = {
+       "alpha": arch_alpha,
+       "ev4": arch_ev4,
+       "ev45": arch_ev45,
+       "ev5": arch_ev5,
+       "ev56": arch_ev56,
+       "pca56": arch_pca56,
+       "ev6": arch_ev6,
+       "ev67": arch_ev67
+}
+
+__machine_map = ("alpha", )
+
 class generic_alpha(builder.generic):
        "abstract base class for all alpha builders"
        def __init__(self,myspec):
@@ -66,10 +79,3 @@ class arch_ev67(generic_alpha):
                self.settings["CFLAGS"]+=" -O2 -mcpu=ev67"
                self.settings["CHOST"]="alphaev67-unknown-linux-gnu"
                self.settings["HOSTUSE"]=["ev6"]
-
-def register():
-       "Inform main catalyst program of the contents of this plugin."
-       return ({ "alpha":arch_alpha, "ev4":arch_ev4, "ev45":arch_ev45,
-               "ev5":arch_ev5, "ev56":arch_ev56, "pca56":arch_pca56,
-               "ev6":arch_ev6, "ev67":arch_ev67 }, 
-       ("alpha", ))

diff --git a/modules/catalyst/arch/amd64.py b/modules/catalyst/arch/amd64.py
index 868760ee16c5847bbdaff3a817b197424691b5da..1501a12e9a8185d68cf00add7ad47c4c54c4c108 100644 (file)
--- a/modules/catalyst/arch/amd64.py
+++ b/modules/catalyst/arch/amd64.py
@@ -1,6 +1,24 @@
 
 import builder
 
+__subarch_map = {
+       "amd64"         : arch_amd64,
+       "k8"            : arch_k8,
+       "opteron"       : arch_k8,
+       "athlon64"      : arch_k8,
+       "athlonfx"      : arch_k8,
+       "nocona"        : arch_nocona,
+# uncomment when gcc 4.3 is stable and delete this line
+#      "core2"         : arch_core2,
+#      "k8-sse3"       : arch_k8_sse3,
+#      "opteron-sse3"  : arch_k8_sse3,
+#      "athlon64-sse3" : arch_k8_sse3,
+#      "amdfam10"      : arch_amdfam10,
+#      "barcelona"     : arch_amdfam10
+}
+
+__machine_map = ("x86_64","amd64","nocona")
+
 class generic_amd64(builder.generic):
        "abstract base class for all amd64 builders"
        def __init__(self,myspec):
@@ -53,22 +71,3 @@ class arch_amdfam10(generic_amd64):
                self.settings["CFLAGS"]="-O2 -march=amdfam10 -pipe"
                self.settings["CHOST"]="x86_64-pc-linux-gnu"
                self.settings["HOSTUSE"]=["mmx","sse","sse2","3dnow"]
-
-def register():
-       "inform main catalyst program of the contents of this plugin"
-       return ({
-               "amd64"         : arch_amd64,
-               "k8"            : arch_k8,
-               "opteron"       : arch_k8,
-               "athlon64"      : arch_k8,
-               "athlonfx"      : arch_k8,
-               "nocona"        : arch_nocona,
-# uncomment when gcc 4.3 is stable and delete this line
-#              "core2"         : arch_core2,
-#              "k8-sse3"       : arch_k8_sse3,
-#              "opteron-sse3"  : arch_k8_sse3,
-#              "athlon64-sse3" : arch_k8_sse3,
-#              "amdfam10"      : arch_amdfam10,
-#              "barcelona"     : arch_amdfam10
-       }, ("x86_64","amd64","nocona"))
-

diff --git a/modules/catalyst/arch/arm.py b/modules/catalyst/arch/arm.py
index f3639f332d31dce5e71cab0f6c80e3ebfc810515..3d875a74946d7d7ce238312b90c213826e537c20 100644 (file)
--- a/modules/catalyst/arch/arm.py
+++ b/modules/catalyst/arch/arm.py
@@ -2,6 +2,15 @@
 import builder,os
 from catalyst_support import *
 
+__subarch_map = {
+       "arm"    : arch_arm,
+       "armv4l" : arch_armv4l,
+       "armeb"  : arch_armeb,
+       "armv5b" : arch_armv5b
+}
+
+__machine_map = ("arm", "armv4l", "armeb", "armv5b", "armv5tel")
+
 class generic_arm(builder.generic):
        "Abstract base class for all arm (little endian) builders"
        def __init__(self,myspec):
@@ -43,13 +52,3 @@ class arch_armv5b(generic_arm):
                generic_arm.__init__(self,myspec)
                self.settings["CFLAGS"]+=" -mcpu=xscale"
                self.settings["CHOST"]="armv5b-unknown-linux-gnu"
-
-def register():
-       "Inform main catalyst program of the contents of this plugin."
-       return ({
-               "arm"    : arch_arm,
-               "armv4l" : arch_armv4l,
-               "armeb"  : arch_armeb,
-               "armv5b" : arch_armv5b
-       }, ("arm", "armv4l", "armeb", "armv5b", "armv5tel") )
-

diff --git a/modules/catalyst/arch/hppa.py b/modules/catalyst/arch/hppa.py
index a222524a07097415d3024e4d00ea5cfa003f3f66..ce30035c5a7aa9b47261952e502d53b2f9255a8a 100644 (file)
--- a/modules/catalyst/arch/hppa.py
+++ b/modules/catalyst/arch/hppa.py
@@ -2,6 +2,14 @@
 import builder,os
 from catalyst_support import *
 
+__subarch_map = {
+       "hppa":         arch_hppa,
+       "hppa1.1":      arch_hppa1_1,
+       "hppa2.0":      arch_hppa2_0
+}
+
+__machine_map = ("parisc","parisc64","hppa","hppa64")
+
 class generic_hppa(builder.generic):
        "Abstract base class for all hppa builders"
        def __init__(self,myspec):
@@ -30,12 +38,3 @@ class arch_hppa2_0(generic_hppa):
                generic_hppa.__init__(self,myspec)
                self.settings["CFLAGS"]+=" -march=2.0"
                self.settings["CHOST"]="hppa2.0-unknown-linux-gnu"
-
-def register():
-       "Inform main catalyst program of the contents of this plugin."
-       return ({
-                       "hppa":         arch_hppa,
-                       "hppa1.1":      arch_hppa1_1,
-                       "hppa2.0":      arch_hppa2_0
-       }, ("parisc","parisc64","hppa","hppa64") )
-

diff --git a/modules/catalyst/arch/ia64.py b/modules/catalyst/arch/ia64.py
index 825af7040f0ccee9f0e9cda6008b1f2e065a5c65..5e17cca8765f9732ca9084d6fda78217b709c606 100644 (file)
--- a/modules/catalyst/arch/ia64.py
+++ b/modules/catalyst/arch/ia64.py
@@ -2,6 +2,12 @@
 import builder,os
 from catalyst_support import *
 
+__subarch_map = {
+       "ia64": arch_ia64
+}
+
+__machine_map = ("ia64", )
+
 class arch_ia64(builder.generic):
        "builder class for ia64"
        def __init__(self,myspec):
@@ -10,7 +16,3 @@ class arch_ia64(builder.generic):
                self.settings["CFLAGS"]="-O2 -pipe"
                self.settings["CFLAGS"]="-O2 -pipe"
                self.settings["CHOST"]="ia64-unknown-linux-gnu"
-
-def register():
-       "Inform main catalyst program of the contents of this plugin."
-       return ({ "ia64":arch_ia64 }, ("ia64", ))

diff --git a/modules/catalyst/arch/mips.py b/modules/catalyst/arch/mips.py
index f39a9924fb9238563356792148d4fd7a26940db6..ee4c06492ec3e764fd86e9cbf8a0f4735797645e 100644 (file)
--- a/modules/catalyst/arch/mips.py
+++ b/modules/catalyst/arch/mips.py
@@ -2,6 +2,35 @@
 import builder,os
 from catalyst_support import *
 
+__subarch_map = { 
+       "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,
+}
+
+__machine_map = ("mips","mips64")
+
 class generic_mips(builder.generic):
        "Abstract base class for all mips builders [Big-endian]"
        def __init__(self,myspec):
@@ -162,32 +191,3 @@ class arch_ip30_n32(generic_mipsel):
        def __init__(self,myspec):
                arch_mips4_n32.__init__(self,myspec)
                self.settings["HOSTUSE"]=["ip30","n32"]
-
-def register():
-       "Inform main catalyst program of the contents of this plugin."
-       return ({ 
-                       "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/modules/catalyst/arch/powerpc.py b/modules/catalyst/arch/powerpc.py
index 46560b8b1b3b30d0e9c854e04a1167cb12be3c88..1e898329c62579526e05a0c9ba2ff52b4c760cac 100644 (file)
--- a/modules/catalyst/arch/powerpc.py
+++ b/modules/catalyst/arch/powerpc.py
@@ -2,6 +2,24 @@
 import os,builder
 from catalyst_support import *
 
+__subarch_map = {
+       "970"           : arch_970,
+       "cell"          : arch_cell,
+       "g3"            : arch_g3,
+       "g4"            : arch_g4,
+       "g5"            : arch_g5,
+       "power"         : arch_power,
+       "power-ppc"     : arch_power_ppc,
+       "power3"        : arch_power3,
+       "power4"        : arch_power4,
+       "power5"        : arch_power5,
+       "power6"        : arch_power6,
+       "ppc"           : arch_ppc,
+       "ppc64"         : arch_ppc64
+}
+
+__machine_map = ("ppc","ppc64","powerpc","powerpc64")
+
 class generic_ppc(builder.generic):
        "abstract base class for all 32-bit powerpc builders"
        def __init__(self,myspec):
@@ -104,22 +122,3 @@ class arch_power6(arch_ppc64):
                arch_ppc64.__init__(self,myspec)
                self.settings["CFLAGS"]="-O2 -pipe -mcpu=power6 -mtune=power6"
                self.settings["HOSTUSE"]=["altivec","ibm"]
-
-def register():
-       "Inform main catalyst program of the contents of this plugin."
-       return ({
-               "970"           : arch_970,
-               "cell"          : arch_cell,
-               "g3"            : arch_g3,
-               "g4"            : arch_g4,
-               "g5"            : arch_g5,
-               "power"         : arch_power,
-               "power-ppc"     : arch_power_ppc,
-               "power3"        : arch_power3,
-               "power4"        : arch_power4,
-               "power5"        : arch_power5,
-               "power6"        : arch_power6,
-               "ppc"           : arch_ppc,
-               "ppc64"         : arch_ppc64
-       }, ("ppc","ppc64","powerpc","powerpc64"))
-

diff --git a/modules/catalyst/arch/s390.py b/modules/catalyst/arch/s390.py
index bf22f668523405d43398aa0b3af2d547d4d4adc0..1c6e425aec7d24407b14c42826ee2079eb77817f 100644 (file)
--- a/modules/catalyst/arch/s390.py
+++ b/modules/catalyst/arch/s390.py
@@ -2,6 +2,13 @@
 import builder,os
 from catalyst_support import *
 
+__subarch_map = {
+       "s390": arch_s390,
+       "s390x": arch_s390x
+}
+
+__machine_map = ("s390", "s390x")
+
 class generic_s390(builder.generic):
        "abstract base class for all s390 builders"
        def __init__(self,myspec):
@@ -27,7 +34,3 @@ class arch_s390x(generic_s390x):
                generic_s390x.__init__(self,myspec)
                self.settings["CFLAGS"]="-O2 -pipe"
                self.settings["CHOST"]="s390x-ibm-linux-gnu"
-
-def register():
-       "Inform main catalyst program of the contents of this plugin."
-       return ({"s390":arch_s390,"s390x":arch_s390x}, ("s390", "s390x"))

diff --git a/modules/catalyst/arch/sparc.py b/modules/catalyst/arch/sparc.py
index 5eb5344cf03ec9ca83780da543eb0a6a3bcbe364..558d1015c11842efe109c2a4faabfb18fa941478 100644 (file)
--- a/modules/catalyst/arch/sparc.py
+++ b/modules/catalyst/arch/sparc.py
@@ -2,6 +2,13 @@
 import builder,os
 from catalyst_support import *
 
+__subarch_map = {
+       "sparc"         : arch_sparc,
+       "sparc64"       : arch_sparc64
+}
+
+__machine_map = ("sparc","sparc64")
+
 class generic_sparc(builder.generic):
        "abstract base class for all sparc builders"
        def __init__(self,myspec):
@@ -33,10 +40,3 @@ class arch_sparc64(generic_sparc64):
                generic_sparc64.__init__(self,myspec)
                self.settings["CFLAGS"]="-O2 -mcpu=ultrasparc -pipe"
                self.settings["CHOST"]="sparc-unknown-linux-gnu"
-
-def register():
-       "Inform main catalyst program of the contents of this plugin."
-       return ({
-               "sparc"         : arch_sparc,
-               "sparc64"       : arch_sparc64
-       }, ("sparc","sparc64", ))

diff --git a/modules/catalyst/arch/x86.py b/modules/catalyst/arch/x86.py
index 324ed7997e5eb1b2283fac66123543bb4fd145a5..1db259d54ef0d6ecd820bf7ec4f874622c009605 100644 (file)
--- a/modules/catalyst/arch/x86.py
+++ b/modules/catalyst/arch/x86.py
@@ -2,6 +2,34 @@
 import builder,os
 from catalyst_support import *
 
+__subarch_map = {
+       "x86"                   : arch_x86,
+       "i386"                  : arch_i386,
+       "i486"                  : arch_i486,
+       "i586"                  : arch_i586,
+       "i686"                  : arch_i686,
+       "pentium"               : arch_i586,
+       "pentium2"              : arch_pentium2,
+       "pentium3"              : arch_pentium3,
+       "pentium3m"             : arch_pentium3,
+       "pentium-m"             : arch_pentium_m,
+       "pentium4"              : arch_pentium4,
+       "pentium4m"             : arch_pentium4,
+       "pentiumpro"            : arch_i686,
+       "pentium-mmx"           : arch_pentium_mmx,
+       "prescott"              : arch_prescott,
+       "k6"                    : arch_k6,
+       "k6-2"                  : arch_k6_2,
+       "k6-3"                  : arch_k6_2,
+       "athlon"                : arch_athlon,
+       "athlon-tbird"          : arch_athlon,
+       "athlon-4"              : arch_athlon_xp,
+       "athlon-xp"             : arch_athlon_xp,
+       "athlon-mp"             : arch_athlon_xp
+}
+
+__machine_map = ('i386', 'i486', 'i586', 'i686')
+
 class generic_x86(builder.generic):
        "abstract base class for all x86 builders"
        def __init__(self,myspec):
@@ -122,32 +150,3 @@ class arch_athlon_xp(generic_x86):
                self.settings["CFLAGS"]="-O2 -march=athlon-xp -pipe"
                self.settings["CHOST"]="i686-pc-linux-gnu"
                self.settings["HOSTUSE"]=["mmx","3dnow","sse"]
-
-def register():
-       "Inform main catalyst program of the contents of this plugin."
-       return ({
-               "x86"                   : arch_x86,
-               "i386"                  : arch_i386,
-               "i486"                  : arch_i486,
-               "i586"                  : arch_i586,
-               "i686"                  : arch_i686,
-               "pentium"               : arch_i586,
-               "pentium2"              : arch_pentium2,
-               "pentium3"              : arch_pentium3,
-               "pentium3m"             : arch_pentium3,
-               "pentium-m"             : arch_pentium_m,
-               "pentium4"              : arch_pentium4,
-               "pentium4m"             : arch_pentium4,
-               "pentiumpro"            : arch_i686,
-               "pentium-mmx"           : arch_pentium_mmx,
-               "prescott"              : arch_prescott,
-               "k6"                    : arch_k6,
-               "k6-2"                  : arch_k6_2,
-               "k6-3"                  : arch_k6_2,
-               "athlon"                : arch_athlon,
-               "athlon-tbird"          : arch_athlon,
-               "athlon-4"              : arch_athlon_xp,
-               "athlon-xp"             : arch_athlon_xp,
-               "athlon-mp"             : arch_athlon_xp
-       }, ('i386', 'i486', 'i586', 'i686'))
-