[gentoo-commits] proj/catalyst:master commit in: catalyst/arch/

[gentoo-commits] proj/catalyst:master commit in: catalyst/arch/

[Matt Turner]

commit:     39e28f75d0308b0cd1f0d41457379510d2c322c4
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 04:00:48 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Apr 14 18:29:14 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=39e28f75

catalyst/arch: Add "r5k" to mips4 configurations

I mistakenly thought -march=mips4 was synonymous with -march=r5k, but it
actually meant r8k until 2015 when it changed to r10k.

Rather than let others be confused (by removing the r10k configuration)
just change the mips4 configs to r5k.

Bug: https://bugs.gentoo.org/679386
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 catalyst/arch/mips.py | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/catalyst/arch/mips.py b/catalyst/arch/mips.py
index f162a334..b1a4b5dc 100644
--- a/catalyst/arch/mips.py
+++ b/catalyst/arch/mips.py
@@ -87,29 +87,29 @@ class arch_mips3_multilib(generic_mips64):
 		generic_mips64.__init__(self,myspec)
 		self.settings["COMMON_FLAGS"]="-O2 -march=mips3 -mplt -mfix-r4000 -mfix-r4400 -pipe"
 
-class arch_mips4(generic_mips):
+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=mips4 -mabi=32 -mplt -pipe"
+		self.settings["COMMON_FLAGS"]="-O2 -march=r5k -mabi=32 -mplt -pipe"
 
-class arch_mips4_n32(generic_mips64):
+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=mips4 -mabi=n32 -mplt -pipe"
+		self.settings["COMMON_FLAGS"]="-O2 -march=r5k -mabi=n32 -mplt -pipe"
 
-class arch_mips4_n64(generic_mips64):
+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=mips4 -mabi=64 -pipe"
+		self.settings["COMMON_FLAGS"]="-O2 -march=r5k -mabi=64 -pipe"
 
-class arch_mips4_multilib(generic_mips64):
+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=mips4 -mplt -pipe"
+		self.settings["COMMON_FLAGS"]="-O2 -march=r5k -mplt -pipe"
 
 class arch_mips4_r10k(generic_mips):
 	"Builder class for MIPS IV R10k [Big-endian]"
@@ -317,29 +317,29 @@ class arch_loongson2f_multilib(generic_mips64el):
 		generic_mips64el.__init__(self,myspec)
 		self.settings["COMMON_FLAGS"]="-O2 -march=loongson2f -mplt -Wa,-mfix-loongson2f-nop -pipe"
 
-class arch_mipsel4(generic_mipsel):
+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=mips4 -mabi=32 -mplt -pipe"
+		self.settings["COMMON_FLAGS"]="-O2 -march=r5k -mabi=32 -mplt -pipe"
 
-class arch_mipsel4_n32(generic_mips64el):
+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=mips4 -mabi=n32 -mplt -pipe"
+		self.settings["COMMON_FLAGS"]="-O2 -march=r5k -mabi=n32 -mplt -pipe"
 
-class arch_mipsel4_n64(generic_mips64el):
+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=mips4 -mabi=64 -pipe"
+		self.settings["COMMON_FLAGS"]="-O2 -march=r5k -mabi=64 -pipe"
 
-class arch_mipsel4_multilib(generic_mips64el):
+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=mips4 -mplt -pipe"
+		self.settings["COMMON_FLAGS"]="-O2 -march=r5k -mplt -pipe"
 
 class arch_mips64el(generic_mipsel):
 	"Builder class for MIPS 64 [Little-endian]"
@@ -440,10 +440,10 @@ def register():
 			"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_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,
@@ -470,10 +470,10 @@ def register():
 			"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,
+			"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,

[gentoo-commits] proj/catalyst:master commit in: catalyst/arch/

[Matt Turner]

commit:     739c9998475358bacd44dc46fdac885a45289d0f
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 12 05:51:57 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 20:43:10 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=739c9998

catalyst/arch: Delete some dead power configs

GCC doesn't support either -mcpu=common nor -mcpu=power. Perhaps it did
long ago...

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

 catalyst/arch/powerpc.py | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/catalyst/arch/powerpc.py b/catalyst/arch/powerpc.py
index e2f241d3..d9938da3 100644
--- a/catalyst/arch/powerpc.py
+++ b/catalyst/arch/powerpc.py
@@ -64,18 +64,6 @@ class arch_g5(generic_ppc):
 		self.settings["COMMON_FLAGS"]="-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["COMMON_FLAGS"]="-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["COMMON_FLAGS"]="-O2 -mcpu=common -mtune=common -pipe"
-
 class arch_power5(arch_ppc64):
 	"builder class for power5 under ppc64"
 	def __init__(self,myspec):
@@ -126,8 +114,6 @@ def register():
 		"g3"		: arch_g3,
 		"g4"		: arch_g4,
 		"g5"		: arch_g5,
-		"power"		: arch_power,
-		"power-ppc"	: arch_power_ppc,
 		"power5"	: arch_power5,
 		"power6"	: arch_power6,
 		"power7"	: arch_power7,

[gentoo-commits] proj/catalyst:master commit in: catalyst/arch/

[Matt Turner]

commit:     7d52a09a1dd3ca7ef8c4e7edd51de0849459991b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 12 23:04:35 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=7d52a09a

catalyst/arch: Add PROFILE_ARCH

This will make the conversion to TOML much easier.

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

 catalyst/arch/alpha.py   | 1 +
 catalyst/arch/amd64.py   | 1 +
 catalyst/arch/arm.py     | 2 ++
 catalyst/arch/arm64.py   | 1 +
 catalyst/arch/hppa.py    | 1 +
 catalyst/arch/ia64.py    | 1 +
 catalyst/arch/m68k.py    | 1 +
 catalyst/arch/mips.py    | 4 ++++
 catalyst/arch/powerpc.py | 2 ++
 catalyst/arch/riscv.py   | 1 +
 catalyst/arch/s390.py    | 2 ++
 catalyst/arch/sh.py      | 2 ++
 catalyst/arch/sparc.py   | 2 ++
 catalyst/arch/x86.py     | 1 +
 14 files changed, 22 insertions(+)

diff --git a/catalyst/arch/alpha.py b/catalyst/arch/alpha.py
index b96be016..ea117bd8 100644
--- a/catalyst/arch/alpha.py
+++ b/catalyst/arch/alpha.py
@@ -9,6 +9,7 @@ class generic_alpha(builder.generic):
 		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+)"

diff --git a/catalyst/arch/amd64.py b/catalyst/arch/amd64.py
index 58904fa2..afff439a 100644
--- a/catalyst/arch/amd64.py
+++ b/catalyst/arch/amd64.py
@@ -5,6 +5,7 @@ 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)"

diff --git a/catalyst/arch/arm.py b/catalyst/arch/arm.py
index 82b0ea32..7b133ef2 100644
--- a/catalyst/arch/arm.py
+++ b/catalyst/arch/arm.py
@@ -7,12 +7,14 @@ class generic_arm(builder.generic):
 	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"

diff --git a/catalyst/arch/arm64.py b/catalyst/arch/arm64.py
index 9a223834..e789ce03 100644
--- a/catalyst/arch/arm64.py
+++ b/catalyst/arch/arm64.py
@@ -7,6 +7,7 @@ class arch_arm64(builder.generic):
 		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."

diff --git a/catalyst/arch/hppa.py b/catalyst/arch/hppa.py
index ee1a835b..8d854bce 100644
--- a/catalyst/arch/hppa.py
+++ b/catalyst/arch/hppa.py
@@ -6,6 +6,7 @@ class generic_hppa(builder.generic):
 	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"

diff --git a/catalyst/arch/ia64.py b/catalyst/arch/ia64.py
index 49b17c46..cecdc39c 100644
--- a/catalyst/arch/ia64.py
+++ b/catalyst/arch/ia64.py
@@ -7,6 +7,7 @@ class arch_ia64(builder.generic):
 		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."

diff --git a/catalyst/arch/m68k.py b/catalyst/arch/m68k.py
index de127fb4..a5e6149c 100644
--- a/catalyst/arch/m68k.py
+++ b/catalyst/arch/m68k.py
@@ -6,6 +6,7 @@ class generic_m68k(builder.generic):
 	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"

diff --git a/catalyst/arch/mips.py b/catalyst/arch/mips.py
index 83265450..7d9210f4 100644
--- a/catalyst/arch/mips.py
+++ b/catalyst/arch/mips.py
@@ -6,24 +6,28 @@ class generic_mips(builder.generic):
 	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]"

diff --git a/catalyst/arch/powerpc.py b/catalyst/arch/powerpc.py
index d9938da3..95892c4f 100644
--- a/catalyst/arch/powerpc.py
+++ b/catalyst/arch/powerpc.py
@@ -7,11 +7,13 @@ class generic_ppc(builder.generic):
 		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"

diff --git a/catalyst/arch/riscv.py b/catalyst/arch/riscv.py
index 6f5695f9..40fda055 100644
--- a/catalyst/arch/riscv.py
+++ b/catalyst/arch/riscv.py
@@ -7,6 +7,7 @@ class arch_riscv(builder.generic):
 		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."

diff --git a/catalyst/arch/s390.py b/catalyst/arch/s390.py
index f4dfebd9..bc35aeec 100644
--- a/catalyst/arch/s390.py
+++ b/catalyst/arch/s390.py
@@ -5,11 +5,13 @@ 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"

diff --git a/catalyst/arch/sh.py b/catalyst/arch/sh.py
index 36ce2103..75353182 100644
--- a/catalyst/arch/sh.py
+++ b/catalyst/arch/sh.py
@@ -5,11 +5,13 @@ 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]"

diff --git a/catalyst/arch/sparc.py b/catalyst/arch/sparc.py
index 38a1479e..71e01407 100644
--- a/catalyst/arch/sparc.py
+++ b/catalyst/arch/sparc.py
@@ -6,11 +6,13 @@ class generic_sparc(builder.generic):
 		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)"

diff --git a/catalyst/arch/x86.py b/catalyst/arch/x86.py
index a3bce255..316e8e9b 100644
--- a/catalyst/arch/x86.py
+++ b/catalyst/arch/x86.py
@@ -6,6 +6,7 @@ class generic_x86(builder.generic):
 		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+)"

[gentoo-commits] proj/catalyst:master commit in: catalyst/arch/

[Matt Turner]

commit:     b2546740f479fd80b4e8f9f6bdb12187ea163dcd
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 00:23:09 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 20:43:10 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b2546740

catalyst/arch: Delete some x86 configs

The Linux kernel dropped i386 support in v3.8.

Also remove the K6-3 alias for K6-2.

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

 catalyst/arch/x86.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/catalyst/arch/x86.py b/catalyst/arch/x86.py
index 751ae769..a3bce255 100644
--- a/catalyst/arch/x86.py
+++ b/catalyst/arch/x86.py
@@ -115,7 +115,6 @@ 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,
@@ -129,7 +128,6 @@ def register():
 		"prescott"		: arch_prescott,
 		"k6"			: arch_k6,
 		"k6-2"			: arch_k6_2,
-		"k6-3"			: arch_k6_2,
 		"athlon"		: arch_athlon,
 		"athlon-xp"		: arch_athlon_xp,
-	}, ('i386', 'i486', 'i586', 'i686'))
+	}, ('i486', 'i586', 'i686'))

[gentoo-commits] proj/catalyst:master commit in: catalyst/arch/

[Matt Turner]

commit:     45a978390cbe85f90a0e5dda53eb9d48ab4067b7
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 04:03:08 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=45a97839

catalyst/arch: Delete mips cobalt configs

With the r5k configurations in place, these are redundant.

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

 catalyst/arch/mips.py | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/catalyst/arch/mips.py b/catalyst/arch/mips.py
index b1a4b5dc..83265450 100644
--- a/catalyst/arch/mips.py
+++ b/catalyst/arch/mips.py
@@ -413,23 +413,9 @@ class arch_loongson3a_multilib(generic_mips64el):
 		generic_mips64el.__init__(self,myspec)
 		self.settings["COMMON_FLAGS"]="-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["COMMON_FLAGS"]="-O2 -march=r5000 -mabi=32 -mplt -pipe"
-
-class arch_cobalt_n32(generic_mips64el):
-	"Builder class for cobalt [Little-endian N32]"
-	def __init__(self,myspec):
-		generic_mips64el.__init__(self,myspec)
-		self.settings["COMMON_FLAGS"]="-O2 -march=r5000 -mabi=n32 -mplt -pipe"
-
 def register():
 	"Inform main catalyst program of the contents of this plugin."
 	return ({
-			"cobalt"			: arch_cobalt,
-			"cobalt_n32"			: arch_cobalt_n32,
 			"mips1"				: arch_mips1,
 			"mips2"				: arch_mips2,
 			"mips32"			: arch_mips32,

[gentoo-commits] proj/catalyst:master commit in: catalyst/arch/

[Matt Turner]

commit:     0aa79899781447509c65a789bb9cc369311c5977
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 11 07:09:07 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Apr 11 07:09:07 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0aa79899

catalyst/arch: Remove subarch aliases

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

 catalyst/arch/amd64.py | 6 ------
 catalyst/arch/mips.py  | 2 --
 catalyst/arch/x86.py   | 5 -----
 3 files changed, 13 deletions(-)

diff --git a/catalyst/arch/amd64.py b/catalyst/arch/amd64.py
index 980be552..58904fa2 100644
--- a/catalyst/arch/amd64.py
+++ b/catalyst/arch/amd64.py
@@ -58,15 +58,9 @@ def register():
 	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/catalyst/arch/mips.py b/catalyst/arch/mips.py
index 1ac6f85d..f7fbcc5b 100644
--- a/catalyst/arch/mips.py
+++ b/catalyst/arch/mips.py
@@ -432,7 +432,6 @@ def register():
 	return ({
 			"cobalt"			: arch_cobalt,
 			"cobalt_n32"			: arch_cobalt_n32,
-			"mips"				: arch_mips1,
 			"mips1"				: arch_mips1,
 			"mips2"				: arch_mips2,
 			"mips32"			: arch_mips32,
@@ -463,7 +462,6 @@ def register():
 			"mips64r2_n32"			: arch_mips64r2_n32,
 			"mips64r2_n64"			: arch_mips64r2_n64,
 			"mips64r2_multilib"		: arch_mips64r2_multilib,
-			"mipsel"			: arch_mipsel1,
 			"mipsel1"			: arch_mipsel1,
 			"mipsel2"			: arch_mipsel2,
 			"mips32el"			: arch_mips32el,

diff --git a/catalyst/arch/x86.py b/catalyst/arch/x86.py
index 4e50fea9..307365dc 100644
--- a/catalyst/arch/x86.py
+++ b/catalyst/arch/x86.py
@@ -125,10 +125,8 @@ def register():
 		"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,
@@ -136,8 +134,5 @@ def register():
 		"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'))

[gentoo-commits] proj/catalyst:master commit in: catalyst/arch/

[Matt Turner]

commit:     34c5eb362aab60b4ffe6f7e454c944d1b1670a9f
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 11 19:27:52 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Apr 11 19:27:52 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=34c5eb36

catalyst/arch: Drop alpha CHOSTs

I remember bugs about some CHOSTs breaking openssl, for example. No
point in using them as far as I am aware.

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

 catalyst/arch/alpha.py | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/catalyst/arch/alpha.py b/catalyst/arch/alpha.py
index 83bad8b8..b96be016 100644
--- a/catalyst/arch/alpha.py
+++ b/catalyst/arch/alpha.py
@@ -8,66 +8,53 @@ class generic_alpha(builder.generic):
 	def __init__(self,myspec):
 		builder.generic.__init__(self,myspec)
 		self.settings["COMMON_FLAGS"]="-mieee -pipe"
-
-class arch_alpha(generic_alpha):
-	"builder class for generic alpha (ev4+)"
-	def __init__(self,myspec):
-		generic_alpha.__init__(self,myspec)
-		self.settings["COMMON_FLAGS"]+=" -O2 -mcpu=ev4"
 		self.settings["CHOST"]="alpha-unknown-linux-gnu"
 
 class arch_ev4(generic_alpha):
-	"builder class for alpha ev4"
+	"builder class for generic alpha (ev4+)"
 	def __init__(self,myspec):
 		generic_alpha.__init__(self,myspec)
 		self.settings["COMMON_FLAGS"]+=" -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["COMMON_FLAGS"]+=" -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["COMMON_FLAGS"]+=" -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["COMMON_FLAGS"]+=" -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["COMMON_FLAGS"]+=" -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["COMMON_FLAGS"]+=" -O2 -mcpu=ev6"
-		self.settings["CHOST"]="alphaev6-unknown-linux-gnu"
 
 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"
-		self.settings["CHOST"]="alphaev67-unknown-linux-gnu"
 
 def register():
 	"Inform main catalyst program of the contents of this plugin."
-	return ({ "alpha":arch_alpha, "ev4":arch_ev4, "ev45":arch_ev45,
+	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", ))

[gentoo-commits] proj/catalyst:master commit in: catalyst/arch/

[Matt Turner]

commit:     e93b6722850c0dee941db30f6981968adcd3fd53
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 11 07:10:56 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Apr 11 07:10:56 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e93b6722

catalyst/arch: Drop hppa1.0

I don't think Linux ever ran on these. Wikipedia doesn't even know the
names of the chips. We have never built stages for 1.0 as far as I can
tell.

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

 catalyst/arch/hppa.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/catalyst/arch/hppa.py b/catalyst/arch/hppa.py
index b3c5c931..ee1a835b 100644
--- a/catalyst/arch/hppa.py
+++ b/catalyst/arch/hppa.py
@@ -7,13 +7,6 @@ class generic_hppa(builder.generic):
 		builder.generic.__init__(self,myspec)
 		self.settings["COMMON_FLAGS"]="-O2 -pipe"
 
-class arch_hppa(generic_hppa):
-	"Builder class for hppa systems"
-	def __init__(self,myspec):
-		generic_hppa.__init__(self,myspec)
-		self.settings["COMMON_FLAGS"]+=" -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):
@@ -31,7 +24,6 @@ class arch_hppa2_0(generic_hppa):
 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") )

[gentoo-commits] proj/catalyst:master commit in: catalyst/arch/

[Matt Turner]

commit:     ebbfbc3f9f65036e9269c1b5b0fde5ba1702d25c
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 11 19:25:36 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Apr 11 19:25:36 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ebbfbc3f

catalyst/arch: Remove some dead HOSTUSE

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

 catalyst/arch/alpha.py | 2 --
 catalyst/arch/mips.py  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/catalyst/arch/alpha.py b/catalyst/arch/alpha.py
index 813b0020..83bad8b8 100644
--- a/catalyst/arch/alpha.py
+++ b/catalyst/arch/alpha.py
@@ -57,7 +57,6 @@ class arch_ev6(generic_alpha):
 		generic_alpha.__init__(self,myspec)
 		self.settings["COMMON_FLAGS"]+=" -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)"
@@ -65,7 +64,6 @@ class arch_ev67(generic_alpha):
 		generic_alpha.__init__(self,myspec)
 		self.settings["COMMON_FLAGS"]+=" -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."

diff --git a/catalyst/arch/mips.py b/catalyst/arch/mips.py
index f7fbcc5b..f162a334 100644
--- a/catalyst/arch/mips.py
+++ b/catalyst/arch/mips.py
@@ -418,14 +418,12 @@ class arch_cobalt(generic_mipsel):
 	def __init__(self,myspec):
 		generic_mipsel.__init__(self,myspec)
 		self.settings["COMMON_FLAGS"]="-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["COMMON_FLAGS"]="-O2 -march=r5000 -mabi=n32 -mplt -pipe"
-		self.settings["HOSTUSE"]=["cobalt"]
 
 def register():
 	"Inform main catalyst program of the contents of this plugin."

[gentoo-commits] proj/catalyst:master commit in: catalyst/arch/

[Matt Turner]

commit:     3645981a8a6677b003e0e33ff88aa0588c66a96e
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 11 07:11:41 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Apr 11 07:11:41 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3645981a

catalyst/arch: Drop power3 and power4

Upstream Linux support was dropped in v3.17 and v4.17 respectively.

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

 catalyst/arch/powerpc.py | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/catalyst/arch/powerpc.py b/catalyst/arch/powerpc.py
index 548df44b..0d88cc59 100644
--- a/catalyst/arch/powerpc.py
+++ b/catalyst/arch/powerpc.py
@@ -79,20 +79,6 @@ class arch_power_ppc(generic_ppc):
 		generic_ppc.__init__(self,myspec)
 		self.settings["COMMON_FLAGS"]="-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["COMMON_FLAGS"]="-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["COMMON_FLAGS"]="-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):
@@ -145,8 +131,6 @@ def register():
 		"g5"		: arch_g5,
 		"power"		: arch_power,
 		"power-ppc"	: arch_power_ppc,
-		"power3"	: arch_power3,
-		"power4"	: arch_power4,
 		"power5"	: arch_power5,
 		"power6"	: arch_power6,
 		"power7"	: arch_power7,

[gentoo-commits] proj/catalyst:master commit in: catalyst/arch/

[Matt Turner]

commit:     391ec5099ee6d0c678943b70641d2b3e3c82ced4
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 31 14:57:20 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Mar 31 18:38:23 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=391ec509

catalyst: Enable and fix CPU_FLAGS_X86

In commit be6d7f0b7f0a (use profile for CPU_FLAGS_X86 where appropriate)
we disabled setting CPU_FLAGS_X86 to avoid overriding the profile's
defaults (and in some cases, overriding incorrectly).

While that is undoubtedly the correct thing to do for the generic
classes (e.g., arch_amd64) it does not make sense for the classes
specific to a particular microarchitecture, unless we expect the
defaults of CPU_FLAGS_X86 to change in the future, which seems highly
unlikely.

It also is the wrong thing to do for x86, which does not have a default
CPU_FLAGS_X86.

Fixes: be6d7f0b7f0a (use profile for CPU_FLAGS_X86 where appropriate)
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 catalyst/arch/amd64.py | 14 +++++---------
 catalyst/arch/x86.py   | 13 ++++++-------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/catalyst/arch/amd64.py b/catalyst/arch/amd64.py
index 73bf8b18..980be552 100644
--- a/catalyst/arch/amd64.py
+++ b/catalyst/arch/amd64.py
@@ -11,51 +11,47 @@ class arch_amd64(generic_amd64):
 	def __init__(self,myspec):
 		generic_amd64.__init__(self,myspec)
 		self.settings["COMMON_FLAGS"]="-O2 -pipe"
-		#lines like this appears to be trying to set the profile default, better to use the profile
-		#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["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["COMMON_FLAGS"]="-O2 -march=nocona -pipe"
-		#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
+		self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","mmxext","sse","sse2","sse3"]}
 
-# 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["COMMON_FLAGS"]="-O2 -march=core2 -pipe"
-		#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","ssse3"]}
+		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","sse","sse2","3dnow"]}
+		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","sse","sse2","3dnow"]}
+		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","sse","sse2","3dnow"]}
+		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"
-		#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
 
 def register():
 	"inform main catalyst program of the contents of this plugin"

diff --git a/catalyst/arch/x86.py b/catalyst/arch/x86.py
index de9142f7..4e50fea9 100644
--- a/catalyst/arch/x86.py
+++ b/catalyst/arch/x86.py
@@ -63,29 +63,28 @@ class arch_pentium3(generic_x86):
 	def __init__(self,myspec):
 		generic_x86.__init__(self,myspec)
 		self.settings["COMMON_FLAGS"]="-O2 -march=pentium3 -pipe"
-		self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse"]}
+		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"
-		#lines like this appears to be trying to set the profile default, better to use the profile
-		#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
+		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","sse","sse2"]}
+		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","sse","sse2"]}
+		self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","mmxext","sse","sse2","sse3"]}
 
 class arch_k6(generic_x86):
 	"AMD K6 CPU with MMX support"
@@ -106,14 +105,14 @@ class arch_athlon(generic_x86):
 	def __init__(self,myspec):
 		generic_x86.__init__(self,myspec)
 		self.settings["COMMON_FLAGS"]="-O2 -march=athlon -pipe"
-		self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","3dnow"]}
+		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","3dnow","sse"]}
+		self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","mmxext","3dnow","3dnowext","sse"]}
 
 def register():
 	"Inform main catalyst program of the contents of this plugin."

[gentoo-commits] proj/catalyst:master commit in: catalyst/arch/

[Matt Turner]

commit:     a653540d003abf94776b526f4c76730af4ca0048
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 02:02:53 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 17:48:21 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a653540d

catalyst: Fix "3DNow!" capitalization

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

 catalyst/arch/x86.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/catalyst/arch/x86.py b/catalyst/arch/x86.py
index e00b2684..de9142f7 100644
--- a/catalyst/arch/x86.py
+++ b/catalyst/arch/x86.py
@@ -95,21 +95,21 @@ class arch_k6(generic_x86):
 		self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx"]}
 
 class arch_k6_2(generic_x86):
-	"AMD K6-2 CPU with MMX and 3dNOW! support"
+	"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"
+	"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","3dnow"]}
 
 class arch_athlon_xp(generic_x86):
-	"improved AMD Athlon CPU with MMX, 3dNOW!, enhanced 3dNOW! and full SSE support"
+	"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"

[gentoo-commits] proj/catalyst:master commit in: catalyst/arch/

[Matt Turner]

commit:     d8b8021bbff9a67d98ff4975c5b05cb5bbebad6e
Author:     Fukang Chen <loader <AT> FreeBSD <DOT> org>
AuthorDate: Sat Oct 19 23:40:40 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 00:00:07 2019 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d8b8021b

Update the default CHOST for armv6j_hardfp and armv7a_hardfp

Closes: https://bugs.gentoo.org/692330
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 catalyst/arch/arm.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/catalyst/arch/arm.py b/catalyst/arch/arm.py
index 4b0efd8f..82b0ea32 100644
--- a/catalyst/arch/arm.py
+++ b/catalyst/arch/arm.py
@@ -93,14 +93,14 @@ 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["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-hardfloat-linux-gnueabi"
+		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):

[gentoo-commits] proj/catalyst:master commit in: catalyst/arch/

[Matt Turner]

commit:     0c5789c8b629ec3b0a38b9632fdc58a66ac168db
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 19 23:12:56 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Oct 19 23:12:56 2019 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0c5789c8

arch: Use platform.machine() instead of "buildarch"

In stagebase.py, machinemap contains a mapping of subarches to the name
of the module they're loaded from. For example:

	{
		'g3': 'powerpc',
		'g4': 'powerpc',
		'g5': 'powerpc',
		...
	}

machinemap[subarch] is assigned to self.settings["buildarch"], so it is
always equal to the name of the arch module in use.

ppc.py and ppc64.py were merged into powerpc.py (and similarly sparc.py
and sparc64.py into sparc.py) in commit 4db65217ed36 ("Merged ppc.py and
ppc64.py into powerpc.py and merged sparc.py and sparc64.py into
sparc.py, so we have a cleaner set of arch files.") in 2008, leaving
these checks against self.settings["buildarch"] always evaluating to
false.

amd64/x86 are unaffected since they still exist as separate .py files,
but x86.py is modified for consistency.

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

 catalyst/arch/powerpc.py | 3 ++-
 catalyst/arch/sparc.py   | 3 ++-
 catalyst/arch/x86.py     | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/catalyst/arch/powerpc.py b/catalyst/arch/powerpc.py
index 59a6d625..548df44b 100644
--- a/catalyst/arch/powerpc.py
+++ b/catalyst/arch/powerpc.py
@@ -1,3 +1,4 @@
+import platform
 
 from catalyst import builder
 
@@ -6,7 +7,7 @@ class generic_ppc(builder.generic):
 	def __init__(self,myspec):
 		builder.generic.__init__(self,myspec)
 		self.settings["CHOST"]="powerpc-unknown-linux-gnu"
-		if self.settings["buildarch"]=="ppc64":
+		if platform.machine() == 'ppc64':
 			self.setarch('linux32')
 			self.settings["crosscompile"] = False
 

diff --git a/catalyst/arch/sparc.py b/catalyst/arch/sparc.py
index d0ce8c65..782d8916 100644
--- a/catalyst/arch/sparc.py
+++ b/catalyst/arch/sparc.py
@@ -1,3 +1,4 @@
+import platform
 
 from catalyst import builder
 
@@ -5,7 +6,7 @@ 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 platform.machine() == 'sparc64':
 			self.setarch('linux32')
 			self.settings["crosscompile"] = False
 

diff --git a/catalyst/arch/x86.py b/catalyst/arch/x86.py
index 3e369370..e00b2684 100644
--- a/catalyst/arch/x86.py
+++ b/catalyst/arch/x86.py
@@ -1,3 +1,4 @@
+import platform
 
 from catalyst import builder
 
@@ -5,7 +6,7 @@ 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 platform.machine() == 'x86_64':
 			self.setarch('linux32')
 			self.settings["crosscompile"] = False
 

[gentoo-commits] proj/catalyst:master commit in: catalyst/arch/

[Matt Turner]

commit:     652323790c612d914c7ea0176ebf8be9fcdf33e6
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 03:07:12 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 03:07:12 2019 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=65232379

arch: Set -mcpu=ultrasparc on 32-bit sparc as well

glibc doesn't really support older than UltraSPARC (v9), so the build
fails without this. Similarly, the Linux kernel doesn't support anything
older than v9.

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

 catalyst/arch/sparc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catalyst/arch/sparc.py b/catalyst/arch/sparc.py
index 0308fb3b..d0ce8c65 100644
--- a/catalyst/arch/sparc.py
+++ b/catalyst/arch/sparc.py
@@ -18,7 +18,7 @@ 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 -pipe"
+		self.settings["COMMON_FLAGS"]="-O2 -mcpu=ultrasparc -pipe"
 		self.settings["CHOST"]="sparc-unknown-linux-gnu"
 
 class arch_sparc64(generic_sparc64):

[gentoo-commits] proj/catalyst:master commit in: catalyst/arch/

[Matt Turner]

commit:     8268c8113f37058d817db1aba36fb0f70f124499
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 26 16:46:26 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Aug 26 16:47:52 2019 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=8268c811

arch: Set sparc64 CHOST

... so that it actually builds a 64-bit userland.

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

 catalyst/arch/sparc.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/catalyst/arch/sparc.py b/catalyst/arch/sparc.py
index d9abd4b5..0308fb3b 100644
--- a/catalyst/arch/sparc.py
+++ b/catalyst/arch/sparc.py
@@ -15,18 +15,18 @@ class generic_sparc64(builder.generic):
 		builder.generic.__init__(self,myspec)
 
 class arch_sparc(generic_sparc):
-	"builder class for generic sparc (sun4cdm)"
+	"builder class for generic sparc (32-bit userland)"
 	def __init__(self,myspec):
 		generic_sparc.__init__(self,myspec)
 		self.settings["COMMON_FLAGS"]="-O2 -pipe"
 		self.settings["CHOST"]="sparc-unknown-linux-gnu"
 
 class arch_sparc64(generic_sparc64):
-	"builder class for generic sparc64 (sun4u)"
+	"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"]="sparc-unknown-linux-gnu"
+		self.settings["CHOST"]="sparc64-unknown-linux-gnu"
 
 def register():
 	"Inform main catalyst program of the contents of this plugin."

[gentoo-commits] proj/catalyst:master commit in: catalyst/arch/

[Matt Turner]

commit:     cfc08db3e0c5bf8c163b843e8b48e3774e4f2582
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 24 22:34:02 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 22:39:03 2019 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=cfc08db3

Add builder for riscv64-unknown-linux-gnu

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 catalyst/arch/riscv.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/catalyst/arch/riscv.py b/catalyst/arch/riscv.py
new file mode 100644
index 00000000..6f5695f9
--- /dev/null
+++ b/catalyst/arch/riscv.py
@@ -0,0 +1,13 @@
+
+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"
+
+def register():
+	"Inform main catalyst program of the contents of this plugin."
+	return ({ "riscv":arch_riscv }, ("rv64","riscv64","riscv"))

[gentoo-commits] proj/catalyst:master commit in: catalyst/arch/

[Mike Frysinger]

commit:     9d7da48cd562faa04c06c8c177eb58dccda06e29
Author:     Kevin Zhao <kevin.zhaoshuai <AT> gmail <DOT> com>
AuthorDate: Thu Apr 21 04:42:45 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 05:37:27 2016 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9d7da48c

powerpc: add subarch ppc64le platform

1) For little-endian, add subarch ppc64le,power8le,power7le
2) For big-endian, add subarch power8, power7.
3) ppc64le keyword will be used in create iso and intergrating bootloader.

Signed-off-by: Kevin Zhao <kevin.zhaoshuai <AT> gmail.com>
CC: Mike Frysinger <vapier <AT> gentoo.org>
CC: Leno Hou <lenohou <AT> gmail.com>

 catalyst/arch/powerpc.py | 37 ++++++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/catalyst/arch/powerpc.py b/catalyst/arch/powerpc.py
index 7f4194e..0288945 100644
--- a/catalyst/arch/powerpc.py
+++ b/catalyst/arch/powerpc.py
@@ -28,6 +28,13 @@ class arch_ppc64(generic_ppc64):
 		self.settings["CFLAGS"]="-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["CFLAGS"]="-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):
@@ -99,12 +106,32 @@ class arch_power6(arch_ppc64):
 		self.settings["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-O2 -pipe -mcpu=power7 -mtune=power7 -mabi=elfv2"
+		self.settings["HOSTUSE"]=["altivec","ibm"]
+
 class arch_power8(arch_ppc64):
-	"builder class for power8 under ppc64le"
+	"builder class for power8 under ppc64"
 	def __init__(self,myspec):
 		arch_ppc64.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -pipe -mcpu=power8 -mtune=power8 -mabi=elfv2"
-		self.settings["CHOST"]="powerpc64le-unknown-linux-gnu"
+		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["CFLAGS"]="-O2 -pipe -mcpu=power8 -mtune=power8 -mabi=elfv2"
 		self.settings["HOSTUSE"]=["altivec","ibm"]
 
 def register():
@@ -121,7 +148,11 @@ def register():
 		"power4"	: arch_power4,
 		"power5"	: arch_power5,
 		"power6"	: arch_power6,
+		"power7"	: arch_power7,
+		"power7le"	: arch_power7le,
 		"power8"	: arch_power8,
+		"power8le"	: arch_power8le,
 		"ppc"		: arch_ppc,
-		"ppc64"		: arch_ppc64
+		"ppc64"		: arch_ppc64,
+		"ppc64le"	: arch_ppc64le,
 	}, ("ppc","ppc64","ppc64le","powerpc","powerpc64","powerpc64le"))

[gentoo-commits] proj/catalyst:master commit in: catalyst/arch/

[Anthony G. Basile]

commit:     0b7d52277fdade0493dc4852cb5137d90f7059c2
Author:     Leno Hou <lenohou <AT> gmail <DOT> com>
AuthorDate: Tue Sep 22 22:34:26 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Sep 22 22:39:07 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0b7d5227

Currently catalyst does not support ppc64le arch,
we add subarch power8 to support ppc64le and make stage files.

Signed-off-by: Leno Hou <lenohou <AT> gmail.com>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 catalyst/arch/powerpc.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/catalyst/arch/powerpc.py b/catalyst/arch/powerpc.py
index f903b38..8e0f540 100644
--- a/catalyst/arch/powerpc.py
+++ b/catalyst/arch/powerpc.py
@@ -108,6 +108,14 @@ class arch_power6(arch_ppc64):
 		self.settings["CFLAGS"]="-O2 -pipe -mcpu=power6 -mtune=power6"
 		self.settings["HOSTUSE"]=["altivec","ibm"]
 
+class arch_power8(arch_ppc64):
+	"builder class for power8 under ppc64le"
+	def __init__(self,myspec):
+		arch_ppc64.__init__(self,myspec)
+		self.settings["CFLAGS"]="-O2 -pipe -mcpu=power8 -mtune=power8 -mabi=elfv2"
+		self.settings["CHOST"]="powerpc64le-unknown-linux-gnu"
+		self.settings["HOSTUSE"]=["altivec","ibm"]
+
 def register():
 	"Inform main catalyst program of the contents of this plugin."
 	return ({
@@ -122,6 +130,7 @@ def register():
 		"power4"	: arch_power4,
 		"power5"	: arch_power5,
 		"power6"	: arch_power6,
+		"power8"	: arch_power8,
 		"ppc"		: arch_ppc,
 		"ppc64"		: arch_ppc64
-	}, ("ppc","ppc64","powerpc","powerpc64"))
+	}, ("ppc","ppc64","ppc64le","powerpc","powerpc64","powerpc64le"))

[gentoo-commits] proj/catalyst:master commit in: catalyst/arch/

[Richard Farina]

commit:     7ce134028d60da97798ccd410c7a8c72f5e2bc22
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  9 16:20:49 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Sep  9 16:21:08 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=7ce13402

catalyst currently cannot handle a missing CHOST definition, so redundantly set it redundantly

 catalyst/arch/x86.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/catalyst/arch/x86.py b/catalyst/arch/x86.py
index eb4470c..f0c4a4c 100644
--- a/catalyst/arch/x86.py
+++ b/catalyst/arch/x86.py
@@ -57,6 +57,7 @@ class arch_pentium_mmx(generic_x86):
 	def __init__(self,myspec):
 		generic_x86.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -march=pentium-mmx -pipe"
+		self.settings["CHOST"]="i686-pc-linux-gnu"
 		self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx"]}
 
 class arch_pentium2(generic_x86):
@@ -64,6 +65,7 @@ class arch_pentium2(generic_x86):
 	def __init__(self,myspec):
 		generic_x86.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -march=pentium2 -pipe"
+		self.settings["CHOST"]="i686-pc-linux-gnu"
 		self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx"]}
 
 class arch_pentium3(generic_x86):
@@ -71,6 +73,7 @@ class arch_pentium3(generic_x86):
 	def __init__(self,myspec):
 		generic_x86.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -march=pentium3 -pipe"
+		self.settings["CHOST"]="i686-pc-linux-gnu"
 		self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse"]}
 
 class arch_pentium4(generic_x86):
@@ -78,6 +81,7 @@ class arch_pentium4(generic_x86):
 	def __init__(self,myspec):
 		generic_x86.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -march=pentium4 -pipe"
+		self.settings["CHOST"]="i686-pc-linux-gnu"
 		#lines like this appears to be trying to set the profile default, better to use the profile
 		#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
 
@@ -86,6 +90,7 @@ class arch_pentium_m(generic_x86):
 	def __init__(self,myspec):
 		generic_x86.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -march=pentium-m -pipe"
+		self.settings["CHOST"]="i686-pc-linux-gnu"
 		#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
 
 class arch_prescott(generic_x86):
@@ -93,8 +98,8 @@ class arch_prescott(generic_x86):
 	def __init__(self,myspec):
 		generic_x86.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -march=prescott -pipe"
-		#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
 		self.settings["CHOST"]="i686-pc-linux-gnu"
+		#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
 
 class arch_k6(generic_x86):
 	"AMD K6 CPU with MMX support"

[gentoo-commits] proj/catalyst:master commit in: catalyst/arch/

[Richard Farina]

commit:     be6d7f0b7f0a36d4bbfa30704dbccf6bd76f5754
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 17:49:38 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 17:49:38 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=be6d7f0b

use profile for CPU_FLAGS_X86 where appropriate

a number of the CPU_FLAGS_X86 settings appeared to be trying to use something
very much like the default from the profile but missing mmxext.  Due to this,
a number of packages like ffmpeg would be broken, where using the profile is
better.

Modified to remove (comment out) the ones that appeared to be attempting to
use the default (and failing) while leaving in the settings which are intentionally
disabling certain unavailable features per sub-arch.

 catalyst/arch/amd64.py | 15 ++++++++-------
 catalyst/arch/x86.py   |  7 ++++---
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/catalyst/arch/amd64.py b/catalyst/arch/amd64.py
index dccfa46..1e11be9 100644
--- a/catalyst/arch/amd64.py
+++ b/catalyst/arch/amd64.py
@@ -13,7 +13,8 @@ class arch_amd64(generic_amd64):
 		generic_amd64.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -pipe"
 		self.settings["CHOST"]="x86_64-pc-linux-gnu"
-		self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
+		#lines like this appears to be trying to set the profile default, better to use the profile
+		#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["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"
@@ -21,7 +22,7 @@ class arch_nocona(generic_amd64):
 		generic_amd64.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -march=nocona -pipe"
 		self.settings["CHOST"]="x86_64-pc-linux-gnu"
-		self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
+		#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
 
 # Requires gcc 4.3 to use this class
 class arch_core2(generic_amd64):
@@ -30,7 +31,7 @@ class arch_core2(generic_amd64):
 		generic_amd64.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -march=core2 -pipe"
 		self.settings["CHOST"]="x86_64-pc-linux-gnu"
-		self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","ssse3"]}
+		#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","ssse3"]}
 
 class arch_k8(generic_amd64):
 	"generic k8, opteron and athlon64 support"
@@ -38,7 +39,7 @@ class arch_k8(generic_amd64):
 		generic_amd64.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -march=k8 -pipe"
 		self.settings["CHOST"]="x86_64-pc-linux-gnu"
-		self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","3dnow"]}
+		#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","3dnow"]}
 
 class arch_k8_sse3(generic_amd64):
 	"improved versions of k8, opteron and athlon64 with SSE3 support"
@@ -46,7 +47,7 @@ class arch_k8_sse3(generic_amd64):
 		generic_amd64.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -march=k8-sse3 -pipe"
 		self.settings["CHOST"]="x86_64-pc-linux-gnu"
-		self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","3dnow"]}
+		#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","3dnow"]}
 
 class arch_amdfam10(generic_amd64):
 	"AMD Family 10h core based CPUs with x86-64 instruction set support"
@@ -54,7 +55,7 @@ class arch_amdfam10(generic_amd64):
 		generic_amd64.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -march=amdfam10 -pipe"
 		self.settings["CHOST"]="x86_64-pc-linux-gnu"
-		self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","3dnow"]}
+		#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2","3dnow"]}
 
 class arch_x32(generic_amd64):
 	"builder class for generic x32 (Intel and AMD)"
@@ -62,7 +63,7 @@ class arch_x32(generic_amd64):
 		generic_amd64.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -pipe"
 		self.settings["CHOST"]="x86_64-pc-linux-gnux32"
-		self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
+		#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
 
 def register():
 	"inform main catalyst program of the contents of this plugin"

diff --git a/catalyst/arch/x86.py b/catalyst/arch/x86.py
index 08ba6d4..eb4470c 100644
--- a/catalyst/arch/x86.py
+++ b/catalyst/arch/x86.py
@@ -78,21 +78,22 @@ class arch_pentium4(generic_x86):
 	def __init__(self,myspec):
 		generic_x86.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -march=pentium4 -pipe"
-		self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
+		#lines like this appears to be trying to set the profile default, better to use the profile
+		#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["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["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
+		#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["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["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
+		#self.settings["HOSTUSEEXPAND"]={"CPU_FLAGS_X86":["mmx","sse","sse2"]}
 		self.settings["CHOST"]="i686-pc-linux-gnu"
 
 class arch_k6(generic_x86):

[gentoo-commits] proj/catalyst:master commit in: catalyst/arch/

[Brian Dolbec]

commit:     2091f3e3c2fee8d6ccf0f322b9dfbc461ba26e5c
Author:     Joshua Kinard <kumba <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 10 11:57:18 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 02:37:50 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2091f3e3

arch/mips.py: update MIPS targets

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 catalyst/arch/mips.py | 96 ++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 69 insertions(+), 27 deletions(-)

diff --git a/catalyst/arch/mips.py b/catalyst/arch/mips.py
index 5297a4b..5416d22 100644
--- a/catalyst/arch/mips.py
+++ b/catalyst/arch/mips.py
@@ -35,6 +35,12 @@ class arch_mips1(generic_mips):
 		generic_mips.__init__(self,myspec)
 		self.settings["CFLAGS"]="-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["CFLAGS"]="-O2 -march=mips2 -mabi=32 -mplt -pipe"
+
 class arch_mips32(generic_mips):
 	"Builder class for MIPS 32 [Big-endian]"
 	def __init__(self,myspec):
@@ -133,6 +139,30 @@ class arch_mips4_r10k_multilib(generic_mips64):
 		generic_mips64.__init__(self,myspec)
 		self.settings["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-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["CFLAGS"]="-O2 -march=r12k -mno-fix-r10000 -mplt -pipe"
+
 class arch_mips64(generic_mips):
 	"Builder class for MIPS 64 [Big-endian]"
 	def __init__(self,myspec):
@@ -187,6 +217,12 @@ class arch_mipsel1(generic_mipsel):
 		generic_mipsel.__init__(self,myspec)
 		self.settings["CFLAGS"]="-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["CFLAGS"]="-O2 -march=mips2 -mabi=32 -mplt -pipe"
+
 class arch_mips32el(generic_mipsel):
 	"Builder class for MIPS 32 [Little-endian]"
 	def __init__(self,myspec):
@@ -398,66 +434,72 @@ class arch_cobalt_n32(generic_mips64el):
 def register():
 	"Inform main catalyst program of the contents of this plugin."
 	return ({
-			"cobalt"				: arch_cobalt,
+			"cobalt"			: arch_cobalt,
 			"cobalt_n32"			: arch_cobalt_n32,
-			"mips"					: arch_mips1,
-			"mips1"					: arch_mips1,
-			"mips32"				: arch_mips32,
+			"mips"				: arch_mips1,
+			"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,
+			"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"				: 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,
+			"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"			: 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,
+			"mipsel"			: arch_mipsel1,
+			"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,
+			"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"			: arch_mipsel4,
 			"mipsel4_n32"			: arch_mipsel4_n32,
 			"mipsel4_n64"			: arch_mipsel4_n64,
 			"mipsel4_multilib"		: arch_mipsel4_multilib,
-			"mips64el"				: arch_mips64el,
+			"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,
+			"mips64r2el_multilib"		: arch_mips64r2el_multilib,
 			"loongson2e"			: arch_loongson2e,
 			"loongson2e_n32"		: arch_loongson2e_n32,
 			"loongson2e_n64"		: arch_loongson2e_n64,
-			"loongson2e_multilib"	: arch_loongson2e_multilib,
+			"loongson2e_multilib"		: arch_loongson2e_multilib,
 			"loongson2f"			: arch_loongson2f,
 			"loongson2f_n32"		: arch_loongson2f_n32,
 			"loongson2f_n64"		: arch_loongson2f_n64,
-			"loongson2f_multilib"	: arch_loongson2f_multilib,
+			"loongson2f_multilib"		: arch_loongson2f_multilib,
 			"loongson3a"			: arch_loongson3a,
 			"loongson3a_n32"		: arch_loongson3a_n32,
 			"loongson3a_n64"		: arch_loongson3a_n64,
-			"loongson3a_multilib"	: arch_loongson3a_multilib,
+			"loongson3a_multilib"		: arch_loongson3a_multilib,
 	}, ("mips","mips64"))

[gentoo-commits] proj/catalyst:pending commit in: catalyst/arch/

[Brian Dolbec]

commit:     d6c58087a2f9622b75c7f38eb0ec890f9b565b50
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 04:38:43 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Wed Apr  2 20:04:23 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=d6c58087

Add arm64 support

Brian Dolbec: Modify patch for the new directory structure and apply.
              Cleanup the imports.

---
 catalyst/arch/arm64.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/catalyst/arch/arm64.py b/catalyst/arch/arm64.py
new file mode 100644
index 0000000..00e7527
--- /dev/null
+++ b/catalyst/arch/arm64.py
@@ -0,0 +1,15 @@
+
+from catalyst import builder
+
+class arch_arm64(builder.generic):
+	"builder class for arm64"
+	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"]="aarch64-unknown-linux-gnu"
+
+def register():
+	"Inform main catalyst program of the contents of this plugin."
+	return ({ "arm64":arch_arm64 }, ("aarch64","arm64", ))

[gentoo-commits] proj/catalyst:master commit in: catalyst/arch/

[Brian Dolbec]

commit:     d6c58087a2f9622b75c7f38eb0ec890f9b565b50
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 04:38:43 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Wed Apr  2 20:04:23 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=d6c58087

Add arm64 support

Brian Dolbec: Modify patch for the new directory structure and apply.
              Cleanup the imports.

---
 catalyst/arch/arm64.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/catalyst/arch/arm64.py b/catalyst/arch/arm64.py
new file mode 100644
index 0000000..00e7527
--- /dev/null
+++ b/catalyst/arch/arm64.py
@@ -0,0 +1,15 @@
+
+from catalyst import builder
+
+class arch_arm64(builder.generic):
+	"builder class for arm64"
+	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"]="aarch64-unknown-linux-gnu"
+
+def register():
+	"Inform main catalyst program of the contents of this plugin."
+	return ({ "arm64":arch_arm64 }, ("aarch64","arm64", ))

[gentoo-commits] proj/catalyst:pending commit in: catalyst/arch/

[Brian Dolbec]

commit:     bb5d5cee504b6be0f1fb9d00a6ea0eadc5907c8e
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  2 16:13:43 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sun Mar  2 16:14:51 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=bb5d5cee

catalyst/arch/m68k.py: fix missed import cleanup during move/rebase.

---
 catalyst/arch/m68k.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/catalyst/arch/m68k.py b/catalyst/arch/m68k.py
index 37b26a4..c9f194b 100644
--- a/catalyst/arch/m68k.py
+++ b/catalyst/arch/m68k.py
@@ -1,6 +1,5 @@
 
-import builder,os
-from catalyst_support import *
+from catalyst import builder
 
 class generic_m68k(builder.generic):
 	"abstract base class for all m68k builders"

[gentoo-commits] proj/catalyst:master commit in: catalyst/arch/

[Brian Dolbec]

commit:     bb5d5cee504b6be0f1fb9d00a6ea0eadc5907c8e
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  2 16:13:43 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sun Mar  2 16:14:51 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=bb5d5cee

catalyst/arch/m68k.py: fix missed import cleanup during move/rebase.

---
 catalyst/arch/m68k.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/catalyst/arch/m68k.py b/catalyst/arch/m68k.py
index 37b26a4..c9f194b 100644
--- a/catalyst/arch/m68k.py
+++ b/catalyst/arch/m68k.py
@@ -1,6 +1,5 @@
 
-import builder,os
-from catalyst_support import *
+from catalyst import builder
 
 class generic_m68k(builder.generic):
 	"abstract base class for all m68k builders"