commit:     fd0bfc5f7c918e510fb6b7bcd3de75a77fb3ea67
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 12 03:50:56 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Apr 14 18:29:25 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=fd0bfc5f

catalyst/arch: Delete

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 catalyst/arch/__init__.py |   0
 catalyst/arch/alpha.py    |  61 ------
 catalyst/arch/amd64.py    |  67 -------
 catalyst/arch/arm.py      | 133 -------------
 catalyst/arch/arm64.py    |  14 --
 catalyst/arch/hppa.py     |  30 ---
 catalyst/arch/ia64.py     |  14 --
 catalyst/arch/m68k.py     |  21 --
 catalyst/arch/mips.py     | 487 ----------------------------------------------
 catalyst/arch/powerpc.py  | 128 ------------
 catalyst/arch/riscv.py    |  14 --
 catalyst/arch/s390.py     |  32 ---
 catalyst/arch/sh.py       | 115 -----------
 catalyst/arch/sparc.py    |  36 ----
 catalyst/arch/x86.py      | 134 -------------
 catalyst/builder.py       |   3 -
 setup.py                  |   1 -
 17 files changed, 1290 deletions(-)

diff --git a/catalyst/arch/__init__.py b/catalyst/arch/__init__.py
deleted file mode 100644
index e69de29b..00000000

diff --git a/catalyst/arch/alpha.py b/catalyst/arch/alpha.py
deleted file mode 100644
index ea117bd8..00000000
--- a/catalyst/arch/alpha.py
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-from catalyst import builder
-
-
-class generic_alpha(builder.generic):
-       "abstract base class for all alpha builders"
-       def __init__(self,myspec):
-               builder.generic.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-mieee -pipe"
-               self.settings["CHOST"]="alpha-unknown-linux-gnu"
-               self.settings["PROFILE_ARCH"] = "alpha"
-
-class arch_ev4(generic_alpha):
-       "builder class for generic alpha (ev4+)"
-       def __init__(self,myspec):
-               generic_alpha.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]+=" -O2 -mcpu=ev4"
-
-class arch_ev45(generic_alpha):
-       "builder class for alpha ev45"
-       def __init__(self,myspec):
-               generic_alpha.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]+=" -O2 -mcpu=ev45"
-
-class arch_ev5(generic_alpha):
-       "builder class for alpha ev5"
-       def __init__(self,myspec):
-               generic_alpha.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]+=" -O2 -mcpu=ev5"
-
-class arch_ev56(generic_alpha):
-       "builder class for alpha ev56 (ev5 plus BWX)"
-       def __init__(self,myspec):
-               generic_alpha.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]+=" -O2 -mcpu=ev56"
-
-class arch_pca56(generic_alpha):
-       "builder class for alpha pca56 (ev5 plus BWX & MAX)"
-       def __init__(self,myspec):
-               generic_alpha.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]+=" -O2 -mcpu=pca56"
-
-class arch_ev6(generic_alpha):
-       "builder class for alpha ev6"
-       def __init__(self,myspec):
-               generic_alpha.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]+=" -O2 -mcpu=ev6"
-
-class arch_ev67(generic_alpha):
-       "builder class for alpha ev67 (ev6 plus CIX)"
-       def __init__(self,myspec):
-               generic_alpha.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]+=" -O2 -mcpu=ev67"
-
-def register():
-       "Inform main catalyst program of the contents of this plugin."
-       return ({ "alpha":arch_ev4, "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/catalyst/arch/amd64.py b/catalyst/arch/amd64.py
deleted file mode 100644
index afff439a..00000000
--- a/catalyst/arch/amd64.py
+++ /dev/null
@@ -1,67 +0,0 @@
-
-from catalyst import builder
-
-class generic_amd64(builder.generic):
-       "abstract base class for all amd64 builders"
-       def __init__(self,myspec):
-               builder.generic.__init__(self,myspec)
-               self.settings["PROFILE_ARCH"] = "amd64"
-
-class arch_amd64(generic_amd64):
-       "builder class for generic amd64 (Intel and AMD)"
-       def __init__(self,myspec):
-               generic_amd64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -pipe"
-
-class arch_nocona(generic_amd64):
-       "improved version of Intel Pentium 4 CPU with 64-bit extensions, MMX, 
SSE, SSE2 and SSE3 support"
-       def __init__(self,myspec):
-               generic_amd64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=nocona -pipe"
-               
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","mmxext","sse","sse2","sse3"]}
-
-class arch_core2(generic_amd64):
-       "Intel Core 2 CPU with 64-bit extensions, MMX, SSE, SSE2, SSE3 and 
SSSE3 support"
-       def __init__(self,myspec):
-               generic_amd64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=core2 -pipe"
-               
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","mmxext","sse","sse2","sse3","ssse3"]}
-
-class arch_k8(generic_amd64):
-       "generic k8, opteron and athlon64 support"
-       def __init__(self,myspec):
-               generic_amd64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=k8 -pipe"
-               
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","mmxext","3dnow","3dnowext","sse","sse2"]}
-
-class arch_k8_sse3(generic_amd64):
-       "improved versions of k8, opteron and athlon64 with SSE3 support"
-       def __init__(self,myspec):
-               generic_amd64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=k8-sse3 -pipe"
-               
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","mmxext","3dnow","3dnowext","sse","sse2","sse3"]}
-
-class arch_amdfam10(generic_amd64):
-       "AMD Family 10h core based CPUs with x86-64 instruction set support"
-       def __init__(self,myspec):
-               generic_amd64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=amdfam10 -pipe"
-               
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","mmxext","3dnow","3dnowext","sse","sse2","sse3","sse4a"]}
-
-class arch_x32(generic_amd64):
-       "builder class for generic x32 (Intel and AMD)"
-       def __init__(self,myspec):
-               generic_amd64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -pipe"
-
-def register():
-       "inform main catalyst program of the contents of this plugin"
-       return ({
-               "amd64"         : arch_amd64,
-               "k8"            : arch_k8,
-               "nocona"        : arch_nocona,
-               "core2"         : arch_core2,
-               "k8-sse3"       : arch_k8_sse3,
-               "amdfam10"      : arch_amdfam10,
-               "x32"           : arch_x32,
-       }, ("x86_64","amd64","nocona"))

diff --git a/catalyst/arch/arm.py b/catalyst/arch/arm.py
deleted file mode 100644
index 7b133ef2..00000000
--- a/catalyst/arch/arm.py
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-from catalyst import builder
-
-class generic_arm(builder.generic):
-       "Abstract base class for all arm (little endian) builders"
-       def __init__(self,myspec):
-               builder.generic.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -pipe"
-               self.settings["PROFILE_ARCH"] = "arm"
-
-class generic_armeb(builder.generic):
-       "Abstract base class for all arm (big endian) builders"
-       def __init__(self,myspec):
-               builder.generic.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -pipe"
-               self.settings["PROFILE_ARCH"] = "arm"
-
-class arch_arm(generic_arm):
-       "Builder class for arm (little endian) target"
-       def __init__(self,myspec):
-               generic_arm.__init__(self,myspec)
-               self.settings["CHOST"]="arm-unknown-linux-gnu"
-
-class arch_armeb(generic_armeb):
-       "Builder class for arm (big endian) target"
-       def __init__(self,myspec):
-               generic_armeb.__init__(self,myspec)
-               self.settings["CHOST"]="armeb-unknown-linux-gnu"
-
-class arch_armv4l(generic_arm):
-       "Builder class for armv4l target"
-       def __init__(self,myspec):
-               generic_arm.__init__(self,myspec)
-               self.settings["CHOST"]="armv4l-unknown-linux-gnu"
-               self.settings["COMMON_FLAGS"]+=" -march=armv4"
-
-class arch_armv4tl(generic_arm):
-       "Builder class for armv4tl target"
-       def __init__(self,myspec):
-               generic_arm.__init__(self,myspec)
-               self.settings["CHOST"]="armv4tl-softfloat-linux-gnueabi"
-               self.settings["COMMON_FLAGS"]+=" -march=armv4t"
-
-class arch_armv5tl(generic_arm):
-       "Builder class for armv5tl target"
-       def __init__(self,myspec):
-               generic_arm.__init__(self,myspec)
-               self.settings["CHOST"]="armv5tl-softfloat-linux-gnueabi"
-               self.settings["COMMON_FLAGS"]+=" -march=armv5t"
-
-class arch_armv5tel(generic_arm):
-       "Builder class for armv5tel target"
-       def __init__(self,myspec):
-               generic_arm.__init__(self,myspec)
-               self.settings["CHOST"]="armv5tel-softfloat-linux-gnueabi"
-               self.settings["COMMON_FLAGS"]+=" -march=armv5te"
-
-class arch_armv5tejl(generic_arm):
-       "Builder class for armv5tejl target"
-       def __init__(self,myspec):
-               generic_arm.__init__(self,myspec)
-               self.settings["CHOST"]="armv5tejl-softfloat-linux-gnueabi"
-               self.settings["COMMON_FLAGS"]+=" -march=armv5te"
-
-class arch_armv6j(generic_arm):
-       "Builder class for armv6j target"
-       def __init__(self,myspec):
-               generic_arm.__init__(self,myspec)
-               self.settings["CHOST"]="armv6j-softfp-linux-gnueabi"
-               self.settings["COMMON_FLAGS"]+=" -march=armv6j -mfpu=vfp 
-mfloat-abi=softfp"
-
-class arch_armv6z(generic_arm):
-       "Builder class for armv6z target"
-       def __init__(self,myspec):
-               generic_arm.__init__(self,myspec)
-               self.settings["CHOST"]="armv6z-softfp-linux-gnueabi"
-               self.settings["COMMON_FLAGS"]+=" -march=armv6z -mfpu=vfp 
-mfloat-abi=softfp"
-
-class arch_armv6zk(generic_arm):
-       "Builder class for armv6zk target"
-       def __init__(self,myspec):
-               generic_arm.__init__(self,myspec)
-               self.settings["CHOST"]="armv6zk-softfp-linux-gnueabi"
-               self.settings["COMMON_FLAGS"]+=" -march=armv6zk -mfpu=vfp 
-mfloat-abi=softfp"
-
-class arch_armv7a(generic_arm):
-       "Builder class for armv7a target"
-       def __init__(self,myspec):
-               generic_arm.__init__(self,myspec)
-               self.settings["CHOST"]="armv7a-softfp-linux-gnueabi"
-               self.settings["COMMON_FLAGS"]+=" -march=armv7-a -mfpu=vfpv3-d16 
-mfloat-abi=softfp"
-
-class arch_armv6j_hardfp(generic_arm):
-       "Builder class for armv6j hardfloat target, needs >=gcc-4.5"
-       def __init__(self,myspec):
-               generic_arm.__init__(self,myspec)
-               self.settings["CHOST"]="armv6j-unknown-linux-gnueabihf"
-               self.settings["COMMON_FLAGS"]+=" -march=armv6j -mfpu=vfp 
-mfloat-abi=hard"
-
-class arch_armv7a_hardfp(generic_arm):
-       "Builder class for armv7a hardfloat target, needs >=gcc-4.5"
-       def __init__(self,myspec):
-               generic_arm.__init__(self,myspec)
-               self.settings["CHOST"]="armv7a-unknown-linux-gnueabihf"
-               self.settings["COMMON_FLAGS"]+=" -march=armv7-a -mfpu=vfpv3-d16 
-mfloat-abi=hard"
-
-class arch_armv5teb(generic_armeb):
-       "Builder class for armv5teb (XScale) target"
-       def __init__(self,myspec):
-               generic_armeb.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]+=" -mcpu=xscale"
-               self.settings["CHOST"]="armv5teb-softfloat-linux-gnueabi"
-
-def register():
-       "Inform main catalyst program of the contents of this plugin."
-       return ({
-               "arm"    : arch_arm,
-               "armv4l" : arch_armv4l,
-               "armv4tl": arch_armv4tl,
-               "armv5tl": arch_armv5tl,
-               "armv5tel": arch_armv5tel,
-               "armv5tejl": arch_armv5tejl,
-               "armv6j" : arch_armv6j,
-               "armv6z" : arch_armv6z,
-               "armv6zk" : arch_armv6zk,
-               "armv7a" : arch_armv7a,
-               "armv6j_hardfp" : arch_armv6j_hardfp,
-               "armv7a_hardfp" : arch_armv7a_hardfp,
-               "armeb"  : arch_armeb,
-               "armv5teb" : arch_armv5teb
-       }, ("arm", "armv4l", "armv4tl", "armv5tl", "armv5tel", "armv5tejl", 
"armv6l",
-"armv7l", "armeb", "armv5teb") )

diff --git a/catalyst/arch/arm64.py b/catalyst/arch/arm64.py
deleted file mode 100644
index e789ce03..00000000
--- a/catalyst/arch/arm64.py
+++ /dev/null
@@ -1,14 +0,0 @@
-
-from catalyst import builder
-
-class arch_arm64(builder.generic):
-       "builder class for arm64"
-       def __init__(self,myspec):
-               builder.generic.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -pipe"
-               self.settings["CHOST"]="aarch64-unknown-linux-gnu"
-               self.settings["PROFILE_ARCH"] = "arm64"
-
-def register():
-       "Inform main catalyst program of the contents of this plugin."
-       return ({ "arm64":arch_arm64 }, ("aarch64","arm64", ))

diff --git a/catalyst/arch/hppa.py b/catalyst/arch/hppa.py
deleted file mode 100644
index 8d854bce..00000000
--- a/catalyst/arch/hppa.py
+++ /dev/null
@@ -1,30 +0,0 @@
-
-from catalyst import builder
-
-class generic_hppa(builder.generic):
-       "Abstract base class for all hppa builders"
-       def __init__(self,myspec):
-               builder.generic.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -pipe"
-               self.settings["PROFILE_ARCH"] = "hppa"
-
-class arch_hppa1_1(generic_hppa):
-       "Builder class for hppa 1.1 systems"
-       def __init__(self,myspec):
-               generic_hppa.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]+=" -march=1.1"
-               self.settings["CHOST"]="hppa1.1-unknown-linux-gnu"
-
-class arch_hppa2_0(generic_hppa):
-       "Builder class for hppa 2.0 systems"
-       def __init__(self,myspec):
-               generic_hppa.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]+=" -march=2.0"
-               self.settings["CHOST"]="hppa2.0-unknown-linux-gnu"
-
-def register():
-       "Inform main catalyst program of the contents of this plugin."
-       return ({
-                       "hppa1.1":      arch_hppa1_1,
-                       "hppa2.0":      arch_hppa2_0
-       }, ("parisc","parisc64","hppa","hppa64") )

diff --git a/catalyst/arch/ia64.py b/catalyst/arch/ia64.py
deleted file mode 100644
index cecdc39c..00000000
--- a/catalyst/arch/ia64.py
+++ /dev/null
@@ -1,14 +0,0 @@
-
-from catalyst import builder
-
-class arch_ia64(builder.generic):
-       "builder class for ia64"
-       def __init__(self,myspec):
-               builder.generic.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -pipe"
-               self.settings["CHOST"]="ia64-unknown-linux-gnu"
-               self.settings["PROFILE_ARCH"] = "ia64"
-
-def register():
-       "Inform main catalyst program of the contents of this plugin."
-       return ({ "ia64":arch_ia64 }, ("ia64", ))

diff --git a/catalyst/arch/m68k.py b/catalyst/arch/m68k.py
deleted file mode 100644
index a5e6149c..00000000
--- a/catalyst/arch/m68k.py
+++ /dev/null
@@ -1,21 +0,0 @@
-
-from catalyst import builder
-
-class generic_m68k(builder.generic):
-       "abstract base class for all m68k builders"
-       def __init__(self,myspec):
-               builder.generic.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]=" -pipe"
-               self.settings["PROFILE_ARCH"] = "m68k"
-
-class arch_m68k(generic_m68k):
-       "builder class for generic m68k"
-       def __init__(self,myspec):
-               generic_m68k.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]+=" -O2"
-               self.settings["CHOST"]="m68k-unknown-linux-gnu"
-
-def register():
-       "Inform main catalyst program of the contents of this plugin."
-       return ({ "m68k":arch_m68k },
-       ("m68k", ))

diff --git a/catalyst/arch/mips.py b/catalyst/arch/mips.py
deleted file mode 100644
index 7d9210f4..00000000
--- a/catalyst/arch/mips.py
+++ /dev/null
@@ -1,487 +0,0 @@
-
-from catalyst import builder
-
-class generic_mips(builder.generic):
-       "Abstract base class for all mips builders [Big-endian]"
-       def __init__(self,myspec):
-               builder.generic.__init__(self,myspec)
-               self.settings["CHOST"]="mips-unknown-linux-gnu"
-               self.settings["PROFILE_ARCH"] = "mips"
-
-class generic_mipsel(builder.generic):
-       "Abstract base class for all mipsel builders [Little-endian]"
-       def __init__(self,myspec):
-               builder.generic.__init__(self,myspec)
-               self.settings["CHOST"]="mipsel-unknown-linux-gnu"
-               self.settings["PROFILE_ARCH"] = "mips"
-
-class generic_mips64(builder.generic):
-       "Abstract base class for all mips64 builders [Big-endian]"
-       def __init__(self,myspec):
-               builder.generic.__init__(self,myspec)
-               self.settings["CHOST"]="mips64-unknown-linux-gnu"
-               self.settings["PROFILE_ARCH"] = "mips64"
-
-class generic_mips64el(builder.generic):
-       "Abstract base class for all mips64el builders [Little-endian]"
-       def __init__(self,myspec):
-               builder.generic.__init__(self,myspec)
-               self.settings["CHOST"]="mips64el-unknown-linux-gnu"
-               self.settings["PROFILE_ARCH"] = "mips64"
-
-class arch_mips1(generic_mips):
-       "Builder class for MIPS I [Big-endian]"
-       def __init__(self,myspec):
-               generic_mips.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips1 -mabi=32 -mplt 
-pipe"
-
-class arch_mips2(generic_mips):
-       "Builder class for MIPS II [Big-endian]"
-       def __init__(self,myspec):
-               generic_mips.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips2 -mabi=32 -mplt 
-pipe"
-
-class arch_mips32(generic_mips):
-       "Builder class for MIPS 32 [Big-endian]"
-       def __init__(self,myspec):
-               generic_mips.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips32 -mabi=32 -mplt 
-pipe"
-
-class arch_mips32_softfloat(generic_mips):
-       "Builder class for MIPS 32 [Big-endian softfloat]"
-       def __init__(self,myspec):
-               generic_mips.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips32 -mabi=32 -mplt 
-pipe"
-               self.settings["CHOST"]="mips-softfloat-linux-gnu"
-
-class arch_mips32r2(generic_mips):
-       "Builder class for MIPS 32r2 [Big-endian]"
-       def __init__(self,myspec):
-               generic_mips.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips32r2 -mabi=32 
-mplt -pipe"
-
-class arch_mips32r2_softfloat(generic_mips):
-       "Builder class for MIPS 32r2 [Big-endian softfloat]"
-       def __init__(self,myspec):
-               generic_mips.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips32r2 -mabi=32 
-mplt -pipe"
-               self.settings["CHOST"]="mips-softfloat-linux-gnu"
-
-class arch_mips3(generic_mips):
-       "Builder class for MIPS III [Big-endian]"
-       def __init__(self,myspec):
-               generic_mips.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips3 -mabi=32 -mplt 
-mfix-r4000 -mfix-r4400 -pipe"
-
-class arch_mips3_n32(generic_mips64):
-       "Builder class for MIPS III [Big-endian N32]"
-       def __init__(self,myspec):
-               generic_mips64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips3 -mabi=n32 -mplt 
-mfix-r4000 -mfix-r4400 -pipe"
-
-class arch_mips3_n64(generic_mips64):
-       "Builder class for MIPS III [Big-endian N64]"
-       def __init__(self,myspec):
-               generic_mips64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips3 -mabi=64 
-mfix-r4000 -mfix-r4400 -pipe"
-
-class arch_mips3_multilib(generic_mips64):
-       "Builder class for MIPS III [Big-endian multilib]"
-       def __init__(self,myspec):
-               generic_mips64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips3 -mplt 
-mfix-r4000 -mfix-r4400 -pipe"
-
-class arch_mips4_r5k(generic_mips):
-       "Builder class for MIPS IV [Big-endian]"
-       def __init__(self,myspec):
-               generic_mips.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=r5k -mabi=32 -mplt 
-pipe"
-
-class arch_mips4_r5k_n32(generic_mips64):
-       "Builder class for MIPS IV [Big-endian N32]"
-       def __init__(self,myspec):
-               generic_mips64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=r5k -mabi=n32 -mplt 
-pipe"
-
-class arch_mips4_r5k_n64(generic_mips64):
-       "Builder class for MIPS IV [Big-endian N64]"
-       def __init__(self,myspec):
-               generic_mips64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=r5k -mabi=64 -pipe"
-
-class arch_mips4_r5k_multilib(generic_mips64):
-       "Builder class for MIPS IV [Big-endian multilib]"
-       def __init__(self,myspec):
-               generic_mips64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=r5k -mplt -pipe"
-
-class arch_mips4_r10k(generic_mips):
-       "Builder class for MIPS IV R10k [Big-endian]"
-       def __init__(self,myspec):
-               generic_mips.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=r10k -mabi=32 -mplt 
-pipe"
-
-class arch_mips4_r10k_n32(generic_mips64):
-       "Builder class for MIPS IV R10k [Big-endian N32]"
-       def __init__(self,myspec):
-               generic_mips64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=r10k -mabi=n32 -mplt 
-pipe"
-
-class arch_mips4_r10k_n64(generic_mips64):
-       "Builder class for MIPS IV R10k [Big-endian N64]"
-       def __init__(self,myspec):
-               generic_mips64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=r10k -mabi=64 -pipe"
-
-class arch_mips4_r10k_multilib(generic_mips64):
-       "Builder class for MIPS IV R10k [Big-endian multilib]"
-       def __init__(self,myspec):
-               generic_mips64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=r10k -mplt -pipe"
-
-class arch_mips4_r12k(generic_mips):
-       "Builder class for MIPS IV R12k/R14k/R16k [Big-endian]"
-       def __init__(self,myspec):
-               generic_mips.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=r12k -mno-fix-r10000 
-mabi=32 -mplt -pipe"
-
-class arch_mips4_r12k_n32(generic_mips64):
-       "Builder class for MIPS IV R12k/R14k/R16k [Big-endian N32]"
-       def __init__(self,myspec):
-               generic_mips64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=r12k -mno-fix-r10000 
-mabi=n32 -mplt -pipe"
-
-class arch_mips4_r12k_n64(generic_mips64):
-       "Builder class for MIPS IV R12k/R14k/R16k [Big-endian N64]"
-       def __init__(self,myspec):
-               generic_mips64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=r12k -mno-fix-r10000 
-mabi=64 -pipe"
-
-class arch_mips4_r12k_multilib(generic_mips64):
-       "Builder class for MIPS IV R12k/R14k/R16k [Big-endian multilib]"
-       def __init__(self,myspec):
-               generic_mips64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=r12k -mno-fix-r10000 
-mplt -pipe"
-
-class arch_mips64(generic_mips):
-       "Builder class for MIPS 64 [Big-endian]"
-       def __init__(self,myspec):
-               generic_mips.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips64 -mabi=32 -mplt 
-pipe"
-
-class arch_mips64_n32(generic_mips64):
-       "Builder class for MIPS 64 [Big-endian N32]"
-       def __init__(self,myspec):
-               generic_mips64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips64 -mabi=n32 
-mplt -pipe"
-
-class arch_mips64_n64(generic_mips64):
-       "Builder class for MIPS 64 [Big-endian N64]"
-       def __init__(self,myspec):
-               generic_mips64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips64 -mabi=64 -pipe"
-
-class arch_mips64_multilib(generic_mips64):
-       "Builder class for MIPS 64 [Big-endian multilib]"
-       def __init__(self,myspec):
-               generic_mips64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips64 -mplt -pipe"
-
-class arch_mips64r2(generic_mips):
-       "Builder class for MIPS 64r2 [Big-endian]"
-       def __init__(self,myspec):
-               generic_mips.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips64r2 -mabi=32 
-mplt -pipe"
-
-class arch_mips64r2_n32(generic_mips64):
-       "Builder class for MIPS 64r2 [Big-endian N32]"
-       def __init__(self,myspec):
-               generic_mips64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips64r2 -mabi=n32 
-mplt -pipe"
-
-class arch_mips64r2_n64(generic_mips64):
-       "Builder class for MIPS 64r2 [Big-endian N64]"
-       def __init__(self,myspec):
-               generic_mips64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips64r2 -mabi=64 
-pipe"
-
-class arch_mips64r2_multilib(generic_mips64):
-       "Builder class for MIPS 64r2 [Big-endian multilib]"
-       def __init__(self,myspec):
-               generic_mips64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips64r2 -mplt -pipe"
-
-class arch_mipsel1(generic_mipsel):
-       "Builder class for MIPS I [Little-endian]"
-       def __init__(self,myspec):
-               generic_mipsel.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips1 -mabi=32 -mplt 
-pipe"
-
-class arch_mipsel2(generic_mipsel):
-       "Builder class for MIPS II [Little-endian]"
-       def __init__(self,myspec):
-               generic_mipsel.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips2 -mabi=32 -mplt 
-pipe"
-
-class arch_mips32el(generic_mipsel):
-       "Builder class for MIPS 32 [Little-endian]"
-       def __init__(self,myspec):
-               generic_mipsel.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips32 -mabi=32 -mplt 
-pipe"
-
-class arch_mips32el_softfloat(generic_mipsel):
-       "Builder class for MIPS 32 [Little-endian softfloat]"
-       def __init__(self,myspec):
-               generic_mipsel.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips32 -mabi=32 -mplt 
-pipe"
-               self.settings["CHOST"]="mipsel-softfloat-linux-gnu"
-
-class arch_mips32r2el(generic_mipsel):
-       "Builder class for MIPS 32r2 [Little-endian]"
-       def __init__(self,myspec):
-               generic_mipsel.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips32r2 -mabi=32 
-mplt -pipe"
-
-class arch_mips32r2el_softfloat(generic_mipsel):
-       "Builder class for MIPS 32r2 [Little-endian softfloat]"
-       def __init__(self,myspec):
-               generic_mipsel.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips32r2 -mabi=32 
-mplt -pipe"
-               self.settings["CHOST"]="mipsel-softfloat-linux-gnu"
-
-class arch_mipsel3(generic_mipsel):
-       "Builder class for MIPS III [Little-endian]"
-       def __init__(self,myspec):
-               generic_mipsel.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips3 -mabi=32 -mplt 
-Wa,-mfix-loongson2f-nop -pipe"
-
-class arch_mipsel3_n32(generic_mips64el):
-       "Builder class for MIPS III [Little-endian N32]"
-       def __init__(self,myspec):
-               generic_mips64el.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips3 -mabi=n32 -mplt 
-Wa,-mfix-loongson2f-nop -pipe"
-
-class arch_mipsel3_n64(generic_mips64el):
-       "Builder class for MIPS III [Little-endian N64]"
-       def __init__(self,myspec):
-               generic_mips64el.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips3 -mabi=64 
-Wa,-mfix-loongson2f-nop -pipe"
-
-class arch_mipsel3_multilib(generic_mips64el):
-       "Builder class for MIPS III [Little-endian multilib]"
-       def __init__(self,myspec):
-               generic_mips64el.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips3 -mplt 
-Wa,-mfix-loongson2f-nop -pipe"
-
-class arch_loongson2e(generic_mipsel):
-       "Builder class for Loongson 2E [Little-endian]"
-       def __init__(self,myspec):
-               generic_mipsel.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=loongson2e -mabi=32 
-mplt -pipe"
-
-class arch_loongson2e_n32(generic_mips64el):
-       "Builder class for Loongson 2E [Little-endian N32]"
-       def __init__(self,myspec):
-               generic_mips64el.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=loongson2e -mabi=n32 
-mplt -pipe"
-
-class arch_loongson2e_n64(generic_mips64el):
-       "Builder class for Loongson 2E [Little-endian N64]"
-       def __init__(self,myspec):
-               generic_mips64el.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=loongson2e -mabi=64 
-pipe"
-
-class arch_loongson2e_multilib(generic_mips64el):
-       "Builder class for Loongson 2E [Little-endian multilib]"
-       def __init__(self,myspec):
-               generic_mips64el.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=loongson2e -mplt 
-pipe"
-
-class arch_loongson2f(generic_mipsel):
-       "Builder class for Loongson 2F [Little-endian]"
-       def __init__(self,myspec):
-               generic_mipsel.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=loongson2f -mabi=32 
-mplt -Wa,-mfix-loongson2f-nop -pipe"
-
-class arch_loongson2f_n32(generic_mips64el):
-       "Builder class for Loongson 2F [Little-endian N32]"
-       def __init__(self,myspec):
-               generic_mips64el.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=loongson2f -mabi=n32 
-mplt -Wa,-mfix-loongson2f-nop -pipe"
-
-class arch_loongson2f_n64(generic_mips64el):
-       "Builder class for Loongson 2F [Little-endian N64]"
-       def __init__(self,myspec):
-               generic_mips64el.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=loongson2f -mabi=64 
-Wa,-mfix-loongson2f-nop -pipe"
-
-class arch_loongson2f_multilib(generic_mips64el):
-       "Builder class for Loongson 2F [Little-endian multilib]"
-       def __init__(self,myspec):
-               generic_mips64el.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=loongson2f -mplt 
-Wa,-mfix-loongson2f-nop -pipe"
-
-class arch_mipsel4_r5k(generic_mipsel):
-       "Builder class for MIPS IV [Little-endian]"
-       def __init__(self,myspec):
-               generic_mipsel.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=r5k -mabi=32 -mplt 
-pipe"
-
-class arch_mipsel4_r5k_n32(generic_mips64el):
-       "Builder class for MIPS IV [Little-endian N32]"
-       def __init__(self,myspec):
-               generic_mips64el.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=r5k -mabi=n32 -mplt 
-pipe"
-
-class arch_mipsel4_r5k_n64(generic_mips64el):
-       "Builder class for MIPS IV [Little-endian N64]"
-       def __init__(self,myspec):
-               generic_mips64el.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=r5k -mabi=64 -pipe"
-
-class arch_mipsel4_r5k_multilib(generic_mips64el):
-       "Builder class for MIPS IV [Little-endian multilib]"
-       def __init__(self,myspec):
-               generic_mips64el.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=r5k -mplt -pipe"
-
-class arch_mips64el(generic_mipsel):
-       "Builder class for MIPS 64 [Little-endian]"
-       def __init__(self,myspec):
-               generic_mipsel.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips64 -mabi=32 -mplt 
-pipe"
-
-class arch_mips64el_n32(generic_mips64el):
-       "Builder class for MIPS 64 [Little-endian N32]"
-       def __init__(self,myspec):
-               generic_mips64el.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips64 -mabi=n32 
-mplt -pipe"
-
-class arch_mips64el_n64(generic_mips64el):
-       "Builder class for MIPS 64 [Little-endian N64]"
-       def __init__(self,myspec):
-               generic_mips64el.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips64 -mabi=64 -pipe"
-
-class arch_mips64el_multilib(generic_mips64el):
-       "Builder class for MIPS 64 [Little-endian multilib]"
-       def __init__(self,myspec):
-               generic_mips64el.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips64 -mplt -pipe"
-
-class arch_mips64r2el(generic_mipsel):
-       "Builder class for MIPS 64r2 [Little-endian]"
-       def __init__(self,myspec):
-               generic_mipsel.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips64r2 -mabi=32 
-mplt -pipe"
-
-class arch_mips64r2el_n32(generic_mips64el):
-       "Builder class for MIPS 64r2 [Little-endian N32]"
-       def __init__(self,myspec):
-               generic_mips64el.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips64r2 -mabi=n32 
-mplt -pipe"
-
-class arch_mips64r2el_n64(generic_mips64el):
-       "Builder class for MIPS 64r2 [Little-endian N64]"
-       def __init__(self,myspec):
-               generic_mips64el.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips64r2 -mabi=64 
-pipe"
-
-class arch_mips64r2el_multilib(generic_mips64el):
-       "Builder class for MIPS 64r2 [Little-endian multilib]"
-       def __init__(self,myspec):
-               generic_mips64el.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=mips64r2 -mplt -pipe"
-
-class arch_loongson3a(generic_mipsel):
-       "Builder class for Loongson 3A [Little-endian]"
-       def __init__(self,myspec):
-               generic_mipsel.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=loongson3a -mabi=32 
-mplt -pipe"
-
-class arch_loongson3a_n32(generic_mips64el):
-       "Builder class for Loongson 3A [Little-endian N32]"
-       def __init__(self,myspec):
-               generic_mips64el.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=loongson3a -mabi=n32 
-mplt -pipe"
-
-class arch_loongson3a_n64(generic_mips64el):
-       "Builder class for Loongson 3A [Little-endian N64]"
-       def __init__(self,myspec):
-               generic_mips64el.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=loongson3a -mabi=64 
-pipe"
-
-class arch_loongson3a_multilib(generic_mips64el):
-       "Builder class for Loongson 3A [Little-endian multilib]"
-       def __init__(self,myspec):
-               generic_mips64el.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=loongson3a -mplt 
-pipe"
-
-def register():
-       "Inform main catalyst program of the contents of this plugin."
-       return ({
-                       "mips1"                         : arch_mips1,
-                       "mips2"                         : arch_mips2,
-                       "mips32"                        : arch_mips32,
-                       "mips32_softfloat"              : arch_mips32_softfloat,
-                       "mips32r2"                      : arch_mips32r2,
-                       "mips32r2_softfloat"            : 
arch_mips32r2_softfloat,
-                       "mips3"                         : arch_mips3,
-                       "mips3_n32"                     : arch_mips3_n32,
-                       "mips3_n64"                     : arch_mips3_n64,
-                       "mips3_multilib"                : arch_mips3_multilib,
-                       "mips4_r5k"                     : arch_mips4_r5k,
-                       "mips4_r5k_n32"                 : arch_mips4_r5k_n32,
-                       "mips4_r5k_n64"                 : arch_mips4_r5k_n64,
-                       "mips4_r5k_multilib"            : 
arch_mips4_r5k_multilib,
-                       "mips4_r10k"                    : arch_mips4_r10k,
-                       "mips4_r10k_n32"                : arch_mips4_r10k_n32,
-                       "mips4_r10k_n64"                : arch_mips4_r10k_n64,
-                       "mips4_r10k_multilib"           : 
arch_mips4_r10k_multilib,
-                       "mips4_r12k"                    : arch_mips4_r12k,
-                       "mips4_r12k_n32"                : arch_mips4_r12k_n32,
-                       "mips4_r12k_n64"                : arch_mips4_r12k_n64,
-                       "mips4_r12k_multilib"           : 
arch_mips4_r12k_multilib,
-                       "mips64"                        : arch_mips64,
-                       "mips64_n32"                    : arch_mips64_n32,
-                       "mips64_n64"                    : arch_mips64_n64,
-                       "mips64_multilib"               : arch_mips64_multilib,
-                       "mips64r2"                      : arch_mips64r2,
-                       "mips64r2_n32"                  : arch_mips64r2_n32,
-                       "mips64r2_n64"                  : arch_mips64r2_n64,
-                       "mips64r2_multilib"             : 
arch_mips64r2_multilib,
-                       "mipsel1"                       : arch_mipsel1,
-                       "mipsel2"                       : arch_mipsel2,
-                       "mips32el"                      : arch_mips32el,
-                       "mips32el_softfloat"            : 
arch_mips32el_softfloat,
-                       "mips32r2el"                    : arch_mips32r2el,
-                       "mips32r2el_softfloat"          : 
arch_mips32r2el_softfloat,
-                       "mipsel3"                       : arch_mipsel3,
-                       "mipsel3_n32"                   : arch_mipsel3_n32,
-                       "mipsel3_n64"                   : arch_mipsel3_n64,
-                       "mipsel3_multilib"              : arch_mipsel3_multilib,
-                       "mipsel4_r5k"                   : arch_mipsel4_r5k,
-                       "mipsel4_r5k_n32"               : arch_mipsel4_r5k_n32,
-                       "mipsel4_r5k_n64"               : arch_mipsel4_r5k_n64,
-                       "mipsel4_r5k_multilib"          : 
arch_mipsel4_r5k_multilib,
-                       "mips64el"                      : arch_mips64el,
-                       "mips64el_n32"                  : arch_mips64el_n32,
-                       "mips64el_n64"                  : arch_mips64el_n64,
-                       "mips64el_multilib"             : 
arch_mips64el_multilib,
-                       "mips64r2el"                    : arch_mips64r2el,
-                       "mips64r2el_n32"                : arch_mips64r2el_n32,
-                       "mips64r2el_n64"                : arch_mips64r2el_n64,
-                       "mips64r2el_multilib"           : 
arch_mips64r2el_multilib,
-                       "loongson2e"                    : arch_loongson2e,
-                       "loongson2e_n32"                : arch_loongson2e_n32,
-                       "loongson2e_n64"                : arch_loongson2e_n64,
-                       "loongson2e_multilib"           : 
arch_loongson2e_multilib,
-                       "loongson2f"                    : arch_loongson2f,
-                       "loongson2f_n32"                : arch_loongson2f_n32,
-                       "loongson2f_n64"                : arch_loongson2f_n64,
-                       "loongson2f_multilib"           : 
arch_loongson2f_multilib,
-                       "loongson3a"                    : arch_loongson3a,
-                       "loongson3a_n32"                : arch_loongson3a_n32,
-                       "loongson3a_n64"                : arch_loongson3a_n64,
-                       "loongson3a_multilib"           : 
arch_loongson3a_multilib,
-       }, ("mips","mips64"))

diff --git a/catalyst/arch/powerpc.py b/catalyst/arch/powerpc.py
deleted file mode 100644
index 95892c4f..00000000
--- a/catalyst/arch/powerpc.py
+++ /dev/null
@@ -1,128 +0,0 @@
-from catalyst import builder
-
-class generic_ppc(builder.generic):
-       "abstract base class for all 32-bit powerpc builders"
-       def __init__(self,myspec):
-               builder.generic.__init__(self,myspec)
-               self.settings["CHOST"]="powerpc-unknown-linux-gnu"
-               self.settings['setarch_build'] = 'ppc64'
-               self.settings['setarch_arch'] = 'linux32'
-               self.settings["PROFILE_ARCH"] = "ppc"
-
-class generic_ppc64(builder.generic):
-       "abstract base class for all 64-bit powerpc builders"
-       def __init__(self,myspec):
-               builder.generic.__init__(self,myspec)
-               self.settings["PROFILE_ARCH"] = "ppc64"
-
-class arch_ppc(generic_ppc):
-       "builder class for generic powerpc"
-       def __init__(self,myspec):
-               generic_ppc.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -mcpu=powerpc -mtune=powerpc 
-pipe"
-
-class arch_ppc64(generic_ppc64):
-       "builder class for generic ppc64"
-       def __init__(self,myspec):
-               generic_ppc64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -pipe"
-               self.settings["CHOST"]="powerpc64-unknown-linux-gnu"
-
-class arch_ppc64le(generic_ppc64):
-       "builder class for generic ppc64le"
-       def __init__(self,myspec):
-               generic_ppc64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -pipe"
-               self.settings["CHOST"]="powerpc64le-unknown-linux-gnu"
-
-class arch_970(arch_ppc64):
-       "builder class for 970 aka G5 under ppc64"
-       def __init__(self,myspec):
-               arch_ppc64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -pipe -mcpu=970 -mtune=970"
-               self.settings["HOSTUSE"]=["altivec"]
-
-class arch_cell(arch_ppc64):
-       "builder class for cell under ppc64"
-       def __init__(self,myspec):
-               arch_ppc64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -pipe -mcpu=cell -mtune=cell"
-               self.settings["HOSTUSE"]=["altivec","ibm"]
-
-class arch_g3(generic_ppc):
-       def __init__(self,myspec):
-               generic_ppc.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -mcpu=G3 -mtune=G3 -pipe"
-
-class arch_g4(generic_ppc):
-       def __init__(self,myspec):
-               generic_ppc.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -mcpu=G4 -mtune=G4 -maltivec 
-mabi=altivec -pipe"
-               self.settings["HOSTUSE"]=["altivec"]
-
-class arch_g5(generic_ppc):
-       def __init__(self,myspec):
-               generic_ppc.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -mcpu=G5 -mtune=G5 -maltivec 
-mabi=altivec -pipe"
-               self.settings["HOSTUSE"]=["altivec"]
-
-class arch_power5(arch_ppc64):
-       "builder class for power5 under ppc64"
-       def __init__(self,myspec):
-               arch_ppc64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -pipe -mcpu=power5 
-mtune=power5"
-               self.settings["HOSTUSE"]=["ibm"]
-
-class arch_power6(arch_ppc64):
-       "builder class for power6 under ppc64"
-       def __init__(self,myspec):
-               arch_ppc64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -pipe -mcpu=power6 
-mtune=power6"
-               self.settings["HOSTUSE"]=["altivec","ibm"]
-
-class arch_power7(arch_ppc64):
-       "builder class for power7 under ppc64"
-       def __init__(self,myspec):
-               arch_ppc64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -pipe -mcpu=power7 
-mtune=power7 -mabi=elfv2"
-               self.settings["HOSTUSE"]=["altivec","ibm"]
-
-class arch_power7le(arch_ppc64le):
-       "builder class for power7 under ppc64le"
-       def __init__(self,myspec):
-               arch_ppc64le.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -pipe -mcpu=power7 
-mtune=power7 -mabi=elfv2"
-               self.settings["HOSTUSE"]=["altivec","ibm"]
-
-class arch_power8(arch_ppc64):
-       "builder class for power8 under ppc64"
-       def __init__(self,myspec):
-               arch_ppc64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -pipe -mcpu=power8 
-mtune=power8 -mabi=elfv2"
-               self.settings["HOSTUSE"]=["altivec","ibm"]
-
-class arch_power8le(arch_ppc64le):
-       "builder class for power8 under ppc64le"
-       def __init__(self,myspec):
-               arch_ppc64le.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -pipe -mcpu=power8 
-mtune=power8 -mabi=elfv2"
-               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,
-               "power5"        : arch_power5,
-               "power6"        : arch_power6,
-               "power7"        : arch_power7,
-               "power7le"      : arch_power7le,
-               "power8"        : arch_power8,
-               "power8le"      : arch_power8le,
-               "ppc"           : arch_ppc,
-               "ppc64"         : arch_ppc64,
-               "ppc64le"       : arch_ppc64le,
-       }, ("ppc","ppc64","ppc64le","powerpc","powerpc64","powerpc64le"))

diff --git a/catalyst/arch/riscv.py b/catalyst/arch/riscv.py
deleted file mode 100644
index 40fda055..00000000
--- a/catalyst/arch/riscv.py
+++ /dev/null
@@ -1,14 +0,0 @@
-
-from catalyst import builder
-
-class arch_riscv(builder.generic):
-       "builder class for riscv"
-       def __init__(self,myspec):
-               builder.generic.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -pipe"
-               self.settings["CHOST"]="riscv64-unknown-linux-gnu"
-               self.settings["PROFILE_ARCH"] = "riscv"
-
-def register():
-       "Inform main catalyst program of the contents of this plugin."
-       return ({ "riscv":arch_riscv }, ("rv64","riscv64","riscv"))

diff --git a/catalyst/arch/s390.py b/catalyst/arch/s390.py
deleted file mode 100644
index bc35aeec..00000000
--- a/catalyst/arch/s390.py
+++ /dev/null
@@ -1,32 +0,0 @@
-
-from catalyst import builder
-
-class generic_s390(builder.generic):
-       "abstract base class for all s390 builders"
-       def __init__(self,myspec):
-               builder.generic.__init__(self,myspec)
-               self.settings["PROFILE_ARCH"] = "s390"
-
-class generic_s390x(builder.generic):
-       "abstract base class for all s390x builders"
-       def __init__(self,myspec):
-               builder.generic.__init__(self,myspec)
-               self.settings["PROFILE_ARCH"] = "s390x"
-
-class arch_s390(generic_s390):
-       "builder class for generic s390"
-       def __init__(self,myspec):
-               generic_s390.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -pipe"
-               self.settings["CHOST"]="s390-ibm-linux-gnu"
-
-class arch_s390x(generic_s390x):
-       "builder class for generic s390x"
-       def __init__(self,myspec):
-               generic_s390x.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-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/catalyst/arch/sh.py b/catalyst/arch/sh.py
deleted file mode 100644
index 75353182..00000000
--- a/catalyst/arch/sh.py
+++ /dev/null
@@ -1,115 +0,0 @@
-
-from catalyst import builder
-
-class generic_sh(builder.generic):
-       "Abstract base class for all sh builders [Little-endian]"
-       def __init__(self,myspec):
-               builder.generic.__init__(self,myspec)
-               self.settings["PROFILE_ARCH"] = "sh"
-
-class generic_sheb(builder.generic):
-       "Abstract base class for all sheb builders [Big-endian]"
-       def __init__(self,myspec):
-               builder.generic.__init__(self,myspec)
-               self.settings["PROFILE_ARCH"] = "sh"
-
-class arch_sh(generic_sh):
-       "Builder class for SH [Little-endian]"
-       def __init__(self,myspec):
-               generic_sh.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -pipe"
-               self.settings["CHOST"]="sh-unknown-linux-gnu"
-
-class arch_sh2(generic_sh):
-       "Builder class for SH-2 [Little-endian]"
-       def __init__(self,myspec):
-               generic_sh.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -m2 -pipe"
-               self.settings["CHOST"]="sh2-unknown-linux-gnu"
-
-class arch_sh2a(generic_sh):
-       "Builder class for SH-2A [Little-endian]"
-       def __init__(self,myspec):
-               generic_sh.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -m2a -pipe"
-               self.settings["CHOST"]="sh2a-unknown-linux-gnu"
-
-class arch_sh3(generic_sh):
-       "Builder class for SH-3 [Little-endian]"
-       def __init__(self,myspec):
-               generic_sh.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -m3 -pipe"
-               self.settings["CHOST"]="sh3-unknown-linux-gnu"
-
-class arch_sh4(generic_sh):
-       "Builder class for SH-4 [Little-endian]"
-       def __init__(self,myspec):
-               generic_sh.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -m4 -pipe"
-               self.settings["CHOST"]="sh4-unknown-linux-gnu"
-
-class arch_sh4a(generic_sh):
-       "Builder class for SH-4A [Little-endian]"
-       def __init__(self,myspec):
-               generic_sh.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -m4a -pipe"
-               self.settings["CHOST"]="sh4a-unknown-linux-gnu"
-
-class arch_sheb(generic_sheb):
-       "Builder class for SH [Big-endian]"
-       def __init__(self,myspec):
-               generic_sheb.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -pipe"
-               self.settings["CHOST"]="sheb-unknown-linux-gnu"
-
-class arch_sh2eb(generic_sheb):
-       "Builder class for SH-2 [Big-endian]"
-       def __init__(self,myspec):
-               generic_sheb.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -m2 -pipe"
-               self.settings["CHOST"]="sh2eb-unknown-linux-gnu"
-
-class arch_sh2aeb(generic_sheb):
-       "Builder class for SH-2A [Big-endian]"
-       def __init__(self,myspec):
-               generic_sheb.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -m2a -pipe"
-               self.settings["CHOST"]="sh2aeb-unknown-linux-gnu"
-
-class arch_sh3eb(generic_sheb):
-       "Builder class for SH-3 [Big-endian]"
-       def __init__(self,myspec):
-               generic_sheb.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -m3 -pipe"
-               self.settings["CHOST"]="sh3eb-unknown-linux-gnu"
-
-class arch_sh4eb(generic_sheb):
-       "Builder class for SH-4 [Big-endian]"
-       def __init__(self,myspec):
-               generic_sheb.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -m4 -pipe"
-               self.settings["CHOST"]="sh4eb-unknown-linux-gnu"
-
-class arch_sh4aeb(generic_sheb):
-       "Builder class for SH-4A [Big-endian]"
-       def __init__(self,myspec):
-               generic_sheb.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -m4a -pipe"
-               self.settings["CHOST"]="sh4aeb-unknown-linux-gnu"
-
-def register():
-       "Inform main catalyst program of the contents of this plugin."
-       return ({
-                       "sh"    :arch_sh,
-                       "sh2"   :arch_sh2,
-                       "sh2a"  :arch_sh2a,
-                       "sh3"   :arch_sh3,
-                       "sh4"   :arch_sh4,
-                       "sh4a"  :arch_sh4a,
-                       "sheb"  :arch_sheb,
-                       "sh2eb" :arch_sh2eb,
-                       "sh2aeb" :arch_sh2aeb,
-                       "sh3eb" :arch_sh3eb,
-                       "sh4eb" :arch_sh4eb,
-                       "sh4aeb" :arch_sh4aeb
-       }, 
("sh2","sh2a","sh3","sh4","sh4a","sh2eb","sh2aeb","sh3eb","sh4eb","sh4aeb"))

diff --git a/catalyst/arch/sparc.py b/catalyst/arch/sparc.py
deleted file mode 100644
index 71e01407..00000000
--- a/catalyst/arch/sparc.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from catalyst import builder
-
-class generic_sparc(builder.generic):
-       "abstract base class for all sparc builders"
-       def __init__(self,myspec):
-               builder.generic.__init__(self,myspec)
-               self.settings['setarch_build'] = 'sparc64'
-               self.settings['setarch_arch'] = 'linux32'
-               self.settings["PROFILE_ARCH"] = "sparc"
-
-class generic_sparc64(builder.generic):
-       "abstract base class for all sparc64 builders"
-       def __init__(self,myspec):
-               builder.generic.__init__(self,myspec)
-               self.settings["PROFILE_ARCH"] = "sparc64"
-
-class arch_sparc(generic_sparc):
-       "builder class for generic sparc (32-bit userland)"
-       def __init__(self,myspec):
-               generic_sparc.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -mcpu=ultrasparc -pipe"
-               self.settings["CHOST"]="sparc-unknown-linux-gnu"
-
-class arch_sparc64(generic_sparc64):
-       "builder class for generic sparc64 (64-bit userland)"
-       def __init__(self,myspec):
-               generic_sparc64.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -mcpu=ultrasparc -pipe"
-               self.settings["CHOST"]="sparc64-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/catalyst/arch/x86.py b/catalyst/arch/x86.py
deleted file mode 100644
index 316e8e9b..00000000
--- a/catalyst/arch/x86.py
+++ /dev/null
@@ -1,134 +0,0 @@
-from catalyst import builder
-
-class generic_x86(builder.generic):
-       "abstract base class for all x86 builders"
-       def __init__(self,myspec):
-               builder.generic.__init__(self,myspec)
-               self.settings['setarch_build'] = 'x86_64'
-               self.settings['setarch_arch'] = 'linux32'
-               self.settings["PROFILE_ARCH"] = "x86"
-
-class arch_x86(generic_x86):
-       "builder class for generic x86 (386+)"
-       def __init__(self,myspec):
-               generic_x86.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -mtune=i686 -pipe"
-               self.settings["CHOST"]="i386-pc-linux-gnu"
-
-class arch_i386(generic_x86):
-       "Intel i386 CPU"
-       def __init__(self,myspec):
-               generic_x86.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=i386 -pipe"
-               self.settings["CHOST"]="i386-pc-linux-gnu"
-
-class arch_i486(generic_x86):
-       "Intel i486 CPU"
-       def __init__(self,myspec):
-               generic_x86.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=i486 -pipe"
-               self.settings["CHOST"]="i486-pc-linux-gnu"
-
-class arch_i586(generic_x86):
-       "Intel Pentium CPU"
-       def __init__(self,myspec):
-               generic_x86.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=i586 -pipe"
-               self.settings["CHOST"]="i586-pc-linux-gnu"
-
-class arch_i686(generic_x86):
-       "Intel Pentium Pro CPU"
-       def __init__(self,myspec):
-               generic_x86.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=i686 -pipe"
-
-class arch_pentium_mmx(generic_x86):
-       "Intel Pentium MMX CPU with MMX support"
-       def __init__(self,myspec):
-               generic_x86.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=pentium-mmx -pipe"
-               self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx"]}
-
-class arch_pentium2(generic_x86):
-       "Intel Pentium 2 CPU with MMX support"
-       def __init__(self,myspec):
-               generic_x86.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=pentium2 -pipe"
-               self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx"]}
-
-class arch_pentium3(generic_x86):
-       "Intel Pentium 3 CPU with MMX and SSE support"
-       def __init__(self,myspec):
-               generic_x86.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=pentium3 -pipe"
-               
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","mmxext","sse"]}
-
-class arch_pentium4(generic_x86):
-       "Intel Pentium 4 CPU with MMX, SSE and SSE2 support"
-       def __init__(self,myspec):
-               generic_x86.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=pentium4 -pipe"
-               
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","mmxext","sse","sse2"]}
-
-class arch_pentium_m(generic_x86):
-       "Intel Pentium M CPU with MMX, SSE and SSE2 support"
-       def __init__(self,myspec):
-               generic_x86.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=pentium-m -pipe"
-               
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","mmxext","sse","sse2"]}
-
-class arch_prescott(generic_x86):
-       "improved version of Intel Pentium 4 CPU with MMX, SSE, SSE2 and SSE3 
support"
-       def __init__(self,myspec):
-               generic_x86.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=prescott -pipe"
-               
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","mmxext","sse","sse2","sse3"]}
-
-class arch_k6(generic_x86):
-       "AMD K6 CPU with MMX support"
-       def __init__(self,myspec):
-               generic_x86.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=k6 -pipe"
-               self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx"]}
-
-class arch_k6_2(generic_x86):
-       "AMD K6-2 CPU with MMX and 3DNow! support"
-       def __init__(self,myspec):
-               generic_x86.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=k6-2 -pipe"
-               self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","3dnow"]}
-
-class arch_athlon(generic_x86):
-       "AMD Athlon CPU with MMX, 3DNow!, Enhanced 3DNow! and SSE prefetch 
support"
-       def __init__(self,myspec):
-               generic_x86.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=athlon -pipe"
-               
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","mmxext","3dnow","3dnowext"]}
-
-class arch_athlon_xp(generic_x86):
-       "improved AMD Athlon CPU with MMX, 3DNow!, Enhanced 3DNow! and full SSE 
support"
-       def __init__(self,myspec):
-               generic_x86.__init__(self,myspec)
-               self.settings["COMMON_FLAGS"]="-O2 -march=athlon-xp -pipe"
-               
self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","mmxext","3dnow","3dnowext","sse"]}
-
-def register():
-       "Inform main catalyst program of the contents of this plugin."
-       return ({
-               "x86"                   : arch_x86,
-               "i486"                  : arch_i486,
-               "i586"                  : arch_i586,
-               "i686"                  : arch_i686,
-               "pentium"               : arch_i586,
-               "pentium2"              : arch_pentium2,
-               "pentium3"              : arch_pentium3,
-               "pentium-m"             : arch_pentium_m,
-               "pentium4"              : arch_pentium4,
-               "pentiumpro"            : arch_i686,
-               "pentium-mmx"           : arch_pentium_mmx,
-               "prescott"              : arch_prescott,
-               "k6"                    : arch_k6,
-               "k6-2"                  : arch_k6_2,
-               "athlon"                : arch_athlon,
-               "athlon-xp"             : arch_athlon_xp,
-       }, ('i486', 'i586', 'i686'))

diff --git a/catalyst/builder.py b/catalyst/builder.py
deleted file mode 100644
index 2d139263..00000000
--- a/catalyst/builder.py
+++ /dev/null
@@ -1,3 +0,0 @@
-class generic():
-       def __init__(self,myspec):
-               self.settings=myspec

diff --git a/setup.py b/setup.py
index dba6cd6c..32741a94 100755
--- a/setup.py
+++ b/setup.py
@@ -107,7 +107,6 @@ _setup(
        scripts=['bin/{0}'.format(_package_name)],
        packages=[
                _package_name,
-               '{0}.arch'.format(_package_name),
                '{0}.base'.format(_package_name),
                '{0}.targets'.format(_package_name),
                ],

Reply via email to