Forgot the sh arch module

diff --git a/ChangeLog b/ChangeLog
index e4f809bff98b8285f1a054030a784446a13342a7..957bfdf23e931a2186f04dafb4b3ebe23fafa32b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # 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/sh.py:
+  Forgot the sh arch module
+
   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,

diff --git a/modules/catalyst/arch/sh.py b/modules/catalyst/arch/sh.py
index 8fb970567bdabf99f7e69cc4e55a507eaab6eb47..fca9f89ad4b8e5518fe533b198405f35dce7a986 100644 (file)
--- a/modules/catalyst/arch/sh.py
+++ b/modules/catalyst/arch/sh.py
@@ -2,6 +2,19 @@
 import builder,os
 from catalyst_support import *
 
+__subarch_map = {
+       "sh"    :arch_sh,
+       "sh2"   :arch_sh2,
+       "sh3"   :arch_sh3,
+       "sh4"   :arch_sh4,
+       "sheb"  :arch_sheb,
+       "sh2eb" :arch_sh2eb,
+       "sh3eb" :arch_sh3eb,
+       "sh4eb" :arch_sh4eb
+}
+
+__machine_map = ("sh2","sh3","sh4","sh2eb","sh3eb","sh4eb")
+
 class generic_sh(builder.generic):
        "Abstract base class for all sh builders [Little-endian]"
        def __init__(self,myspec):
@@ -69,16 +82,3 @@ class arch_sh4eb(generic_sheb):
                generic_sheb.__init__(self,myspec)
                self.settings["CFLAGS"]="-O2 -m4 -pipe"
                self.settings["CHOST"]="sh4eb-unknown-linux-gnu"
-
-def register():
-       "Inform main catalyst program of the contents of this plugin."
-       return ({
-                       "sh"    :arch_sh,
-                       "sh2"   :arch_sh2,
-                       "sh3"   :arch_sh3,
-                       "sh4"   :arch_sh4,
-                       "sheb"  :arch_sheb,
-                       "sh2eb" :arch_sh2eb,
-                       "sh3eb" :arch_sh3eb,
-                       "sh4eb" :arch_sh4eb
-       }, ("sh2","sh3","sh4","sh2eb","sh3eb","sh4eb"))