Initial rearrangement of the python directories

New minimal start script, moving the original catalyst script to catalyst/main.py.
Add __init__.py's to modules and arch sub-pkgs.
skip __init__.py when loading the modules.
Update the module loading paths for the new locations.
Fix catalyst_support import to new location and specify imported modules.

12 files changed, 0 insertions, 1301 deletions

diff --git a/arch/alpha.py b/arch/alpha.py
deleted file mode 100644
index f0fc95a5..00000000
--- a/arch/alpha.py
+++ /dev/null
@@ -1,75 +0,0 @@
-
-import builder,os
-from catalyst_support import *
-
-class generic_alpha(builder.generic):
-	"abstract base class for all alpha builders"
-	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
-		self.settings["CHROOT"]="chroot"
-		self.settings["CFLAGS"]="-mieee -pipe"
-
-class arch_alpha(generic_alpha):
-	"builder class for generic alpha (ev4+)"
-	def __init__(self,myspec):
-		generic_alpha.__init__(self,myspec)
-		self.settings["CFLAGS"]+=" -O2 -mcpu=ev4"
-		self.settings["CHOST"]="alpha-unknown-linux-gnu"
-
-class arch_ev4(generic_alpha):
-	"builder class for alpha ev4"
-	def __init__(self,myspec):
-		generic_alpha.__init__(self,myspec)
-		self.settings["CFLAGS"]+=" -O2 -mcpu=ev4"
-		self.settings["CHOST"]="alphaev4-unknown-linux-gnu"
-
-class arch_ev45(generic_alpha):
-	"builder class for alpha ev45"
-	def __init__(self,myspec):
-		generic_alpha.__init__(self,myspec)
-		self.settings["CFLAGS"]+=" -O2 -mcpu=ev45"
-		self.settings["CHOST"]="alphaev45-unknown-linux-gnu"
-
-class arch_ev5(generic_alpha):
-	"builder class for alpha ev5"
-	def __init__(self,myspec):
-		generic_alpha.__init__(self,myspec)
-		self.settings["CFLAGS"]+=" -O2 -mcpu=ev5"
-		self.settings["CHOST"]="alphaev5-unknown-linux-gnu"
-
-class arch_ev56(generic_alpha):
-	"builder class for alpha ev56 (ev5 plus BWX)"
-	def __init__(self,myspec):
-		generic_alpha.__init__(self,myspec)
-		self.settings["CFLAGS"]+=" -O2 -mcpu=ev56"
-		self.settings["CHOST"]="alphaev56-unknown-linux-gnu"
-
-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["CFLAGS"]+=" -O2 -mcpu=pca56"
-		self.settings["CHOST"]="alphaev56-unknown-linux-gnu"
-
-class arch_ev6(generic_alpha):
-	"builder class for alpha ev6"
-	def __init__(self,myspec):
-		generic_alpha.__init__(self,myspec)
-		self.settings["CFLAGS"]+=" -O2 -mcpu=ev6"
-		self.settings["CHOST"]="alphaev6-unknown-linux-gnu"
-		self.settings["HOSTUSE"]=["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["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/arch/amd64.py b/arch/amd64.py
deleted file mode 100644
index 262b55a9..00000000
--- a/arch/amd64.py
+++ /dev/null
@@ -1,83 +0,0 @@
-
-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["CHROOT"]="chroot"
-
-class arch_amd64(generic_amd64):
-	"builder class for generic amd64 (Intel and AMD)"
-	def __init__(self,myspec):
-		generic_amd64.__init__(self,myspec)
-		self.settings["CFLAGS"]="-O2 -pipe"
-		self.settings["CHOST"]="x86_64-pc-linux-gnu"
-		self.settings["HOSTUSE"]=["mmx","sse","sse2"]
-
-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["CFLAGS"]="-O2 -march=nocona -pipe"
-		self.settings["CHOST"]="x86_64-pc-linux-gnu"
-		self.settings["HOSTUSE"]=["mmx","sse","sse2"]
-
-# Requires gcc 4.3 to use this class
-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["CFLAGS"]="-O2 -march=core2 -pipe"
-		self.settings["CHOST"]="x86_64-pc-linux-gnu"
-		self.settings["HOSTUSE"]=["mmx","sse","sse2","ssse3"]
-
-class arch_k8(generic_amd64):
-	"generic k8, opteron and athlon64 support"
-	def __init__(self,myspec):
-		generic_amd64.__init__(self,myspec)
-		self.settings["CFLAGS"]="-O2 -march=k8 -pipe"
-		self.settings["CHOST"]="x86_64-pc-linux-gnu"
-		self.settings["HOSTUSE"]=["mmx","sse","sse2","3dnow"]
-
-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["CFLAGS"]="-O2 -march=k8-sse3 -pipe"
-		self.settings["CHOST"]="x86_64-pc-linux-gnu"
-		self.settings["HOSTUSE"]=["mmx","sse","sse2","3dnow"]
-
-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["CFLAGS"]="-O2 -march=amdfam10 -pipe"
-		self.settings["CHOST"]="x86_64-pc-linux-gnu"
-		self.settings["HOSTUSE"]=["mmx","sse","sse2","3dnow"]
-
-class arch_x32(generic_amd64):
-	"builder class for generic x32 (Intel and AMD)"
-	def __init__(self,myspec):
-		generic_amd64.__init__(self,myspec)
-		self.settings["CFLAGS"]="-O2 -pipe"
-		self.settings["CHOST"]="x86_64-pc-linux-gnux32"
-		self.settings["HOSTUSE"]=["mmx","sse","sse2"]
-
-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,
-		"core2"		: arch_core2,
-		"k8-sse3"	: arch_k8_sse3,
-		"opteron-sse3"	: arch_k8_sse3,
-		"athlon64-sse3"	: arch_k8_sse3,
-		"amdfam10"	: arch_amdfam10,
-		"barcelona"	: arch_amdfam10,
-		"x32"		: arch_x32,
-	}, ("x86_64","amd64","nocona"))
diff --git a/arch/arm.py b/arch/arm.py
deleted file mode 100644
index 2de39429..00000000
--- a/arch/arm.py
+++ /dev/null
@@ -1,133 +0,0 @@
-
-import builder,os
-from catalyst_support import *
-
-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["CHROOT"]="chroot"
-		self.settings["CFLAGS"]="-O2 -pipe"
-
-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["CHROOT"]="chroot"
-		self.settings["CFLAGS"]="-O2 -pipe"
-
-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["CFLAGS"]+=" -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["CFLAGS"]+=" -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["CFLAGS"]+=" -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["CFLAGS"]+=" -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["CFLAGS"]+=" -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["CFLAGS"]+=" -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["CFLAGS"]+=" -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["CFLAGS"]+=" -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["CFLAGS"]+=" -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-hardfloat-linux-gnueabi"
-		self.settings["CFLAGS"]+=" -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-hardfloat-linux-gnueabi"
-		self.settings["CFLAGS"]+=" -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["CFLAGS"]+=" -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/arch/hppa.py b/arch/hppa.py
deleted file mode 100644
index f804398f..00000000
--- a/arch/hppa.py
+++ /dev/null
@@ -1,40 +0,0 @@
-
-import builder,os
-from catalyst_support import *
-
-class generic_hppa(builder.generic):
-	"Abstract base class for all hppa builders"
-	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
-		self.settings["CHROOT"]="chroot"
-		self.settings["CFLAGS"]="-O2 -pipe"
-		self.settings["CXXFLAGS"]="-O2 -pipe"
-
-class arch_hppa(generic_hppa):
-	"Builder class for hppa systems"
-	def __init__(self,myspec):
-		generic_hppa.__init__(self,myspec)
-		self.settings["CFLAGS"]+=" -march=1.0"
-		self.settings["CHOST"]="hppa-unknown-linux-gnu"
-
-class arch_hppa1_1(generic_hppa):
-	"Builder class for hppa 1.1 systems"
-	def __init__(self,myspec):
-		generic_hppa.__init__(self,myspec)
-		self.settings["CFLAGS"]+=" -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["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/arch/ia64.py b/arch/ia64.py
deleted file mode 100644
index 825af704..00000000
--- a/arch/ia64.py
+++ /dev/null
@@ -1,16 +0,0 @@
-
-import builder,os
-from catalyst_support import *
-
-class arch_ia64(builder.generic):
-	"builder class for ia64"
-	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
-		self.settings["CHROOT"]="chroot"
-		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/arch/m68k.py b/arch/m68k.py
deleted file mode 100644
index 37b26a4a..00000000
--- a/arch/m68k.py
+++ /dev/null
@@ -1,22 +0,0 @@
-
-import builder,os
-from catalyst_support import *
-
-class generic_m68k(builder.generic):
-	"abstract base class for all m68k builders"
-	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
-		self.settings["CHROOT"]="chroot"
-		self.settings["CFLAGS"]=" -pipe"
-
-class arch_m68k(generic_m68k):
-	"builder class for generic m68k"
-	def __init__(self,myspec):
-		generic_m68k.__init__(self,myspec)
-		self.settings["CFLAGS"]+=" -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/arch/mips.py b/arch/mips.py
deleted file mode 100644
index b3730fa1..00000000
--- a/arch/mips.py
+++ /dev/null
@@ -1,464 +0,0 @@
-
-import builder,os
-from catalyst_support import *
-
-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["CHROOT"]="chroot"
-		self.settings["CHOST"]="mips-unknown-linux-gnu"
-
-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["CHROOT"]="chroot"
-		self.settings["CHOST"]="mipsel-unknown-linux-gnu"
-
-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["CHROOT"]="chroot"
-		self.settings["CHOST"]="mips64-unknown-linux-gnu"
-
-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["CHROOT"]="chroot"
-		self.settings["CHOST"]="mips64el-unknown-linux-gnu"
-
-class arch_mips1(generic_mips):
-	"Builder class for MIPS I [Big-endian]"
-	def __init__(self,myspec):
-		generic_mips.__init__(self,myspec)
-		self.settings["CFLAGS"]="-O2 -march=mips1 -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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-O2 -march=mips3 -mplt -mfix-r4000 -mfix-r4400 -pipe"
-
-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 -march=mips4 -mabi=32 -mplt -pipe"
-
-class arch_mips4_n32(generic_mips64):
-	"Builder class for MIPS IV [Big-endian N32]"
-	def __init__(self,myspec):
-		generic_mips64.__init__(self,myspec)
-		self.settings["CFLAGS"]="-O2 -march=mips4 -mabi=n32 -mplt -pipe"
-
-class arch_mips4_n64(generic_mips64):
-	"Builder class for MIPS IV [Big-endian N64]"
-	def __init__(self,myspec):
-		generic_mips64.__init__(self,myspec)
-		self.settings["CFLAGS"]="-O2 -march=mips4 -mabi=64 -pipe"
-
-class arch_mips4_multilib(generic_mips64):
-	"Builder class for MIPS IV [Big-endian multilib]"
-	def __init__(self,myspec):
-		generic_mips64.__init__(self,myspec)
-		self.settings["CFLAGS"]="-O2 -march=mips4 -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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-O2 -march=r10k -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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-O2 -march=mips1 -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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-O2 -march=loongson2f -mplt -Wa,-mfix-loongson2f-nop -pipe"
-
-class arch_mipsel4(generic_mipsel):
-	"Builder class for MIPS IV [Little-endian]"
-	def __init__(self,myspec):
-		generic_mipsel.__init__(self,myspec)
-		self.settings["CFLAGS"]="-O2 -march=mips4 -mabi=32 -mplt -pipe"
-
-class arch_mipsel4_n32(generic_mips64el):
-	"Builder class for MIPS IV [Little-endian N32]"
-	def __init__(self,myspec):
-		generic_mips64el.__init__(self,myspec)
-		self.settings["CFLAGS"]="-O2 -march=mips4 -mabi=n32 -mplt -pipe"
-
-class arch_mipsel4_n64(generic_mips64el):
-	"Builder class for MIPS IV [Little-endian N64]"
-	def __init__(self,myspec):
-		generic_mips64el.__init__(self,myspec)
-		self.settings["CFLAGS"]="-O2 -march=mips4 -mabi=64 -pipe"
-
-class arch_mipsel4_multilib(generic_mips64el):
-	"Builder class for MIPS IV [Little-endian multilib]"
-	def __init__(self,myspec):
-		generic_mips64el.__init__(self,myspec)
-		self.settings["CFLAGS"]="-O2 -march=mips4 -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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-O2 -march=loongson3a -mplt -pipe"
-
-class arch_cobalt(generic_mipsel):
-	"Builder class for cobalt [Little-endian]"
-	def __init__(self,myspec):
-		generic_mipsel.__init__(self,myspec)
-		self.settings["CFLAGS"]="-O2 -march=r5000 -mabi=32 -mplt -pipe"
-		self.settings["HOSTUSE"]=["cobalt"]
-
-class arch_cobalt_n32(generic_mips64el):
-	"Builder class for cobalt [Little-endian N32]"
-	def __init__(self,myspec):
-		generic_mips64el.__init__(self,myspec)
-		self.settings["CFLAGS"]="-O2 -march=r5000 -mabi=n32 -mplt -pipe"
-		self.settings["HOSTUSE"]=["cobalt"]
-
-def register():
-	"Inform main catalyst program of the contents of this plugin."
-	return ({
-			"cobalt"				: arch_cobalt,
-			"cobalt_n32"			: arch_cobalt_n32,
-			"mips"					: arch_mips1,
-			"mips1"					: arch_mips1,
-			"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"					: arch_mips4,
-			"mips4_n32"				: arch_mips4_n32,
-			"mips4_n64"				: arch_mips4_n64,
-			"mips4_multilib"		: arch_mips4_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,
-			"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,
-			"mipsel"				: arch_mipsel1,
-			"mipsel1"				: arch_mipsel1,
-			"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"				: arch_mipsel4,
-			"mipsel4_n32"			: arch_mipsel4_n32,
-			"mipsel4_n64"			: arch_mipsel4_n64,
-			"mipsel4_multilib"		: arch_mipsel4_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/arch/powerpc.py b/arch/powerpc.py
deleted file mode 100644
index e9f611bf..00000000
--- a/arch/powerpc.py
+++ /dev/null
@@ -1,124 +0,0 @@
-
-import os,builder
-from catalyst_support import *
-
-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"
-		if self.settings["buildarch"]=="ppc64":
-			if not os.path.exists("/bin/linux32") and not os.path.exists("/usr/bin/linux32"):
-				raise CatalystError,"required executable linux32 not found (\"emerge setarch\" to fix.)"
-			self.settings["CHROOT"]="linux32 chroot"
-			self.settings["crosscompile"] = False;
-		else:
-			self.settings["CHROOT"]="chroot"
-
-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["CHROOT"]="chroot"
-
-class arch_ppc(generic_ppc):
-	"builder class for generic powerpc"
-	def __init__(self,myspec):
-		generic_ppc.__init__(self,myspec)
-		self.settings["CFLAGS"]="-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["CFLAGS"]="-O2 -pipe"
-		self.settings["CHOST"]="powerpc64-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-O2 -mcpu=G3 -mtune=G3 -pipe"
-
-class arch_g4(generic_ppc):
-	def __init__(self,myspec):
-		generic_ppc.__init__(self,myspec)
-		self.settings["CFLAGS"]="-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["CFLAGS"]="-O2 -mcpu=G5 -mtune=G5 -maltivec -mabi=altivec -pipe"
-		self.settings["HOSTUSE"]=["altivec"]
-
-class arch_power(generic_ppc):
-	"builder class for generic power"
-	def __init__(self,myspec):
-		generic_ppc.__init__(self,myspec)
-		self.settings["CFLAGS"]="-O2 -mcpu=power -mtune=power -pipe"
-
-class arch_power_ppc(generic_ppc):
-	"builder class for generic powerpc/power"
-	def __init__(self,myspec):
-		generic_ppc.__init__(self,myspec)
-		self.settings["CFLAGS"]="-O2 -mcpu=common -mtune=common -pipe"
-
-class arch_power3(arch_ppc64):
-	"builder class for power3 under ppc64"
-	def __init__(self,myspec):
-		arch_ppc64.__init__(self,myspec)
-		self.settings["CFLAGS"]="-O2 -pipe -mcpu=power3 -mtune=power3"
-		self.settings["HOSTUSE"]=["ibm"]
-
-class arch_power4(arch_ppc64):
-	"builder class for power4 under ppc64"
-	def __init__(self,myspec):
-		arch_ppc64.__init__(self,myspec)
-		self.settings["CFLAGS"]="-O2 -pipe -mcpu=power4 -mtune=power4"
-		self.settings["HOSTUSE"]=["ibm"]
-
-class arch_power5(arch_ppc64):
-	"builder class for power5 under ppc64"
-	def __init__(self,myspec):
-		arch_ppc64.__init__(self,myspec)
-		self.settings["CFLAGS"]="-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["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/arch/s390.py b/arch/s390.py
deleted file mode 100644
index bf22f668..00000000
--- a/arch/s390.py
+++ /dev/null
@@ -1,33 +0,0 @@
-
-import builder,os
-from catalyst_support import *
-
-class generic_s390(builder.generic):
-	"abstract base class for all s390 builders"
-	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
-		self.settings["CHROOT"]="chroot"
-
-class generic_s390x(builder.generic):
-	"abstract base class for all s390x builders"
-	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
-		self.settings["CHROOT"]="chroot"
-
-class arch_s390(generic_s390):
-	"builder class for generic s390"
-	def __init__(self,myspec):
-		generic_s390.__init__(self,myspec)
-		self.settings["CFLAGS"]="-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["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/arch/sh.py b/arch/sh.py
deleted file mode 100644
index 2fc95315..00000000
--- a/arch/sh.py
+++ /dev/null
@@ -1,116 +0,0 @@
-
-import builder,os
-from catalyst_support import *
-
-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["CHROOT"]="chroot"
-
-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["CHROOT"]="chroot"
-
-class arch_sh(generic_sh):
-	"Builder class for SH [Little-endian]"
-	def __init__(self,myspec):
-		generic_sh.__init__(self,myspec)
-		self.settings["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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/arch/sparc.py b/arch/sparc.py
deleted file mode 100644
index 5eb5344c..00000000
--- a/arch/sparc.py
+++ /dev/null
@@ -1,42 +0,0 @@
-
-import builder,os
-from catalyst_support import *
-
-class generic_sparc(builder.generic):
-	"abstract base class for all sparc builders"
-	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
-		if self.settings["buildarch"]=="sparc64":
-			if not os.path.exists("/bin/linux32") and not os.path.exists("/usr/bin/linux32"):
-				raise CatalystError,"required executable linux32 not found (\"emerge setarch\" to fix.)"
-			self.settings["CHROOT"]="linux32 chroot"
-			self.settings["crosscompile"] = False;
-		else:
-			self.settings["CHROOT"]="chroot"
-
-class generic_sparc64(builder.generic):
-	"abstract base class for all sparc64 builders"
-	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
-		self.settings["CHROOT"]="chroot"
-
-class arch_sparc(generic_sparc):
-	"builder class for generic sparc (sun4cdm)"
-	def __init__(self,myspec):
-		generic_sparc.__init__(self,myspec)
-		self.settings["CFLAGS"]="-O2 -pipe"
-		self.settings["CHOST"]="sparc-unknown-linux-gnu"
-
-class arch_sparc64(generic_sparc64):
-	"builder class for generic sparc64 (sun4u)"
-	def __init__(self,myspec):
-		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/arch/x86.py b/arch/x86.py
deleted file mode 100644
index 0391b792..00000000
--- a/arch/x86.py
+++ /dev/null
@@ -1,153 +0,0 @@
-
-import builder,os
-from catalyst_support import *
-
-class generic_x86(builder.generic):
-	"abstract base class for all x86 builders"
-	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
-		if self.settings["buildarch"]=="amd64":
-			if not os.path.exists("/bin/linux32") and not os.path.exists("/usr/bin/linux32"):
-					raise CatalystError,"required executable linux32 not found (\"emerge setarch\" to fix.)"
-			self.settings["CHROOT"]="linux32 chroot"
-			self.settings["crosscompile"] = False;
-		else:
-			self.settings["CHROOT"]="chroot"
-
-class arch_x86(generic_x86):
-	"builder class for generic x86 (386+)"
-	def __init__(self,myspec):
-		generic_x86.__init__(self,myspec)
-		self.settings["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-O2 -march=i686 -pipe"
-		self.settings["CHOST"]="i686-pc-linux-gnu"
-
-class arch_pentium_mmx(generic_x86):
-	"Intel Pentium MMX CPU with MMX support"
-	def __init__(self,myspec):
-		generic_x86.__init__(self,myspec)
-		self.settings["CFLAGS"]="-O2 -march=pentium-mmx -pipe"
-		self.settings["HOSTUSE"]=["mmx"]
-
-class arch_pentium2(generic_x86):
-	"Intel Pentium 2 CPU with MMX support"
-	def __init__(self,myspec):
-		generic_x86.__init__(self,myspec)
-		self.settings["CFLAGS"]="-O2 -march=pentium2 -pipe"
-		self.settings["HOSTUSE"]=["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["CFLAGS"]="-O2 -march=pentium3 -pipe"
-		self.settings["HOSTUSE"]=["mmx","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["CFLAGS"]="-O2 -march=pentium4 -pipe"
-		self.settings["HOSTUSE"]=["mmx","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["CFLAGS"]="-O2 -march=pentium-m -pipe"
-		self.settings["HOSTUSE"]=["mmx","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["CFLAGS"]="-O2 -march=prescott -pipe"
-		self.settings["HOSTUSE"]=["mmx","sse","sse2"]
-		self.settings["CHOST"]="i686-pc-linux-gnu"
-
-class arch_k6(generic_x86):
-	"AMD K6 CPU with MMX support"
-	def __init__(self,myspec):
-		generic_x86.__init__(self,myspec)
-		self.settings["CFLAGS"]="-O2 -march=k6 -pipe"
-		self.settings["CHOST"]="i686-pc-linux-gnu"
-		self.settings["HOSTUSE"]=["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["CFLAGS"]="-O2 -march=k6-2 -pipe"
-		self.settings["CHOST"]="i686-pc-linux-gnu"
-		self.settings["HOSTUSE"]=["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["CFLAGS"]="-O2 -march=athlon -pipe"
-		self.settings["CHOST"]="i686-pc-linux-gnu"
-		self.settings["HOSTUSE"]=["mmx","3dnow"]
-
-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["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'))