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

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

[Raúl Porcel]

commit:     da5a9e705d36fcb7cad63a0d8457f21b45a49873
Author:     Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  5 18:26:57 2011 +0000
Commit:     Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Sat Feb  5 18:26:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=da5a9e70

Enable new amd64 subarches

---
 ChangeLog     |    5 ++++-
 arch/amd64.py |   13 ++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 72cc346..5278085 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
 # ChangeLog for catalyst
-# Copyright 1999-2010 Gentoo Foundation; 2008-2010 Various authors (see AUTHORS)
+# Copyright 1999-2011 Gentoo Foundation; 2008-2010 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 # $Id$
 
+  05 Feb 2011; Raúl Porcel <armin76@gentoo.org> arch/amd64.py, catalyst:
+  Enable new amd64 subarches
+
   01 Nov 2010; Raúl Porcel <armin76@gentoo.org> catalyst:
   This is catalyst 2.0.6.913
 

diff --git a/arch/amd64.py b/arch/amd64.py
index 868760e..aaf587a 100644
--- a/arch/amd64.py
+++ b/arch/amd64.py
@@ -63,12 +63,11 @@ def register():
 		"athlon64"	: arch_k8,
 		"athlonfx"	: arch_k8,
 		"nocona"	: arch_nocona,
-# uncomment when gcc 4.3 is stable and delete this line
-#		"core2"		: arch_core2,
-#		"k8-sse3"	: arch_k8_sse3,
-#		"opteron-sse3"	: arch_k8_sse3,
-#		"athlon64-sse3"	: arch_k8_sse3,
-#		"amdfam10"	: arch_amdfam10,
-#		"barcelona"	: arch_amdfam10
+		"core2"		: arch_core2,
+		"k8-sse3"	: arch_k8_sse3,
+		"opteron-sse3"	: arch_k8_sse3,
+		"athlon64-sse3"	: arch_k8_sse3,
+		"amdfam10"	: arch_amdfam10,
+		"barcelona"	: arch_amdfam10
 	}, ("x86_64","amd64","nocona"))
 

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

[Matt Turner]

commit:     7e1c15dbd6cb13f72752079af16a10f174694b9b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 16:20:37 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Jun 25 16:20:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=7e1c15db

mips.py: Remove mips2 classes

Linux doesn't even run on mips2

---
 ChangeLog    |    4 ++++
 arch/mips.py |   14 --------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c07d25c..57c0e40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  25 Jun 2011; Matt Turner <mattst88@gentoo.org>
+  modules/catalyst/arch/mips.py: Remove mips2 classes
+  Linux doesn't even run on mips2
+
   24 Jun 2011; Sebastian Pipping <sping@gentoo.org> Makefile,
   doc/asciidoc.conf, doc/catalyst.1.txt, doc/make_subarch_table_guidexml.py:
   Include list of supported subarches in man page.

diff --git a/arch/mips.py b/arch/mips.py
index 260f172..662831d 100644
--- a/arch/mips.py
+++ b/arch/mips.py
@@ -22,12 +22,6 @@ class arch_mips1(generic_mips):
 		generic_mips.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -mips1 -mabi=32 -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 -mips2 -mabi=32 -pipe"
-
 class arch_mips3(generic_mips):
 	"Builder class for MIPS III [Big-endian]"
 	def __init__(self,myspec):
@@ -78,12 +72,6 @@ class arch_mipsel1(generic_mipsel):
 		generic_mipsel.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -mips1 -mabi=32 -pipe"
 
-class arch_mipsel2(generic_mipsel):
-	"Builder class for all MIPS II [Little-endian]"
-	def __init__(self,myspec):
-		generic_mipsel.__init__(self,myspec)
-		self.settings["CFLAGS"]="-O2 -mips2 -mabi=32 -pipe"
-
 class arch_mipsel3(generic_mipsel):
 	"Builder class for all MIPS III [Little-endian]"
 	def __init__(self,myspec):
@@ -204,7 +192,6 @@ def register():
 			"ip30_n32"		: arch_ip30_n32,
 			"mips"			: arch_mips1,
 			"mips1"			: arch_mips1,
-			"mips2"			: arch_mips2,
 			"mips3"			: arch_mips3,
 			"mips3_n32"		: arch_mips3_n32,
 			"mips3_n64"		: arch_mips3_n64,
@@ -212,7 +199,6 @@ def register():
 			"mips4_n32"		: arch_mips4_n32,
 			"mipsel"		: arch_mipsel1,
 			"mipsel1"		: arch_mipsel1,
-			"mipsel2"		: arch_mipsel2,
 			"mipsel3"		: arch_mipsel3,
 			"mipsel3_n32"	: arch_mipsel3_n32,
 			"mipsel4"		: arch_mipsel4,

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

[Matt Turner]

commit:     a18391888798e3301849640f170754d52be5904f
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 16:21:40 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Jun 25 16:21:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=a1839188

mips.py: Remove ip* classes

They were clearly never even tested since they were inheriting the
little-endian abstract class.

---
 ChangeLog    |    3 +++
 arch/mips.py |   42 ------------------------------------------
 2 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 57c0e40..1d9b01d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
 # $Id$
 
   25 Jun 2011; Matt Turner <mattst88@gentoo.org>
+  modules/catalyst/arch/mips.py: Remove ip* classes
+
+  25 Jun 2011; Matt Turner <mattst88@gentoo.org>
   modules/catalyst/arch/mips.py: Remove mips2 classes
   Linux doesn't even run on mips2
 

diff --git a/arch/mips.py b/arch/mips.py
index 662831d..9dbd23b 100644
--- a/arch/mips.py
+++ b/arch/mips.py
@@ -143,53 +143,11 @@ class arch_cobalt_n32(generic_mipsel):
 		self.settings["CFLAGS"]="-O2 -march=r5000 -mabi=n32 -pipe"
 		self.settings["HOSTUSE"]=["cobalt","n32"]
 
-class arch_ip27(generic_mipsel):
-	"Builder class for all IP27 [Big-endian]"
-	def __init__(self,myspec):
-		arch_mips4.__init__(self,myspec)
-		self.settings["HOSTUSE"]=["ip27"]
-
-class arch_ip27_n32(generic_mipsel):
-	"Builder class for all IP27 [Big-endian N32]"
-	def __init__(self,myspec):
-		arch_mips4_n32.__init__(self,myspec)
-		self.settings["HOSTUSE"]=["ip27","n32"]
-
-class arch_ip28(generic_mipsel):
-	"Builder class for all IP28 [Big-endian]"
-	def __init__(self,myspec):
-		arch_mips4.__init__(self,myspec)
-		self.settings["HOSTUSE"]=["ip28"]
-
-class arch_ip28_n32(generic_mipsel):
-	"Builder class for all IP28 [Big-endian N32]"
-	def __init__(self,myspec):
-		arch_mips4_n32.__init__(self,myspec)
-		self.settings["HOSTUSE"]=["ip28","n32"]
-
-class arch_ip30(generic_mipsel):
-	"Builder class for all IP30 [Big-endian]"
-	def __init__(self,myspec):
-		arch_mips4.__init__(self,myspec)
-		self.settings["HOSTUSE"]=["ip30"]
-
-class arch_ip30_n32(generic_mipsel):
-	"Builder class for all IP30 [Big-endian N32]"
-	def __init__(self,myspec):
-		arch_mips4_n32.__init__(self,myspec)
-		self.settings["HOSTUSE"]=["ip30","n32"]
-
 def register():
 	"Inform main catalyst program of the contents of this plugin."
 	return ({ 
 			"cobalt"		: arch_cobalt,
 			"cobalt_n32"	: arch_cobalt_n32,
-			"ip27"			: arch_ip27,
-			"ip27_n32"		: arch_ip27_n32,
-			"ip28"			: arch_ip28,
-			"ip28_n32"		: arch_ip28_n32,
-			"ip30"			: arch_ip30,
-			"ip30_n32"		: arch_ip30_n32,
 			"mips"			: arch_mips1,
 			"mips1"			: arch_mips1,
 			"mips3"			: arch_mips3,

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

[Matt Turner]

commit:     5b7643b805bccf6362b4a442e6bae287852f9959
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 16:23:04 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Jun 25 16:23:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=5b7643b8

mips.py: create generic mips64 classes

... and inherit from them to simplify other classes

---
 ChangeLog    |    4 +++
 arch/mips.py |   67 +++++++++++++++++++++++++++++++--------------------------
 2 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9578cca..a953663 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
 # $Id$
 
   25 Jun 2011; Matt Turner <mattst88@gentoo.org>
+  modules/catalyst/arch/mips.py: create generic mips64 classes
+  and inherit from them to simplify other classes
+
+  25 Jun 2011; Matt Turner <mattst88@gentoo.org>
   modules/catalyst/arch/mips.py: fix CFLAGS in loongson class
 
   25 Jun 2011; Matt Turner <mattst88@gentoo.org>

diff --git a/arch/mips.py b/arch/mips.py
index e8107be..794ee91 100644
--- a/arch/mips.py
+++ b/arch/mips.py
@@ -16,6 +16,20 @@ class generic_mipsel(builder.generic):
 		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):
@@ -28,42 +42,38 @@ class arch_mips3(generic_mips):
 		generic_mips.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -mips3 -mabi=32 -pipe"
 
-class arch_mips3_n32(generic_mips):
+class arch_mips3_n32(generic_mips64):
 	"Builder class for MIPS III [Big-endian N32]"
 	def __init__(self,myspec):
-		generic_mips.__init__(self,myspec)
+		generic_mips64.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -mips3 -mabi=n32 -pipe"
-		self.settings["CHOST"]="mips64-unknown-linux-gnu"
 		self.settings["HOSTUSE"]=["n32"]
 
-class arch_mips3_n64(generic_mips):
+class arch_mips3_n64(generic_mips64):
 	"Builder class for MIPS III [Big-endian N64]"
 	def __init__(self,myspec):
-		generic_mips.__init__(self,myspec)
+		generic_mips64.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -mips3 -mabi=64 -pipe"
-		self.settings["CHOST"]="mips64-unknown-linux-gnu"
 		self.settings["HOSTUSE"]=["n64"]
 
-class arch_mips4(generic_mips):
+class arch_mips4(generic_mips64):
 	"Builder class for MIPS IV [Big-endian]"
 	def __init__(self,myspec):
-		generic_mips.__init__(self,myspec)
+		generic_mips64.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -mips4 -mabi=32 -pipe"
 
-class arch_mips4_n32(generic_mips):
+class arch_mips4_n32(generic_mips64):
 	"Builder class for MIPS IV [Big-endian N32]"
 	def __init__(self,myspec):
-		generic_mips.__init__(self,myspec)
+		generic_mips64.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -mips4 -mabi=n32 -pipe"
-		self.settings["CHOST"]="mips64-unknown-linux-gnu"
 		self.settings["HOSTUSE"]=["n32"]
 
-class arch_mips4_n64(generic_mips):
+class arch_mips4_n64(generic_mips64):
 	"Builder class for MIPS IV [Big-endian N64]"
 	def __init__(self,myspec):
-		generic_mips.__init__(self,myspec)
+		generic_mips64.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -mips4 -mabi=64 -pipe"
-		self.settings["CHOST"]="mips64-unknown-linux-gnu"
 		self.settings["HOSTUSE"]=["n64"]
 
 class arch_mipsel1(generic_mipsel):
@@ -78,12 +88,11 @@ class arch_mipsel3(generic_mipsel):
 		generic_mipsel.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -mips3 -mabi=32 -pipe"
 
-class arch_mipsel3_n32(generic_mipsel):
+class arch_mipsel3_n32(generic_mips64el):
 	"Builder class for all MIPS III [Little-endian N32]"
 	def __init__(self,myspec):
-		generic_mipsel.__init__(self,myspec)
+		generic_mips64el.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -mips3 -mabi=n32 -pipe"
-		self.settings["CHOST"]="mips64el-unknown-linux-gnu"
 		self.settings["HOSTUSE"]=["n32"]
 
 class arch_loongson2e(generic_mipsel):
@@ -92,12 +101,11 @@ class arch_loongson2e(generic_mipsel):
 		generic_mipsel.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -march=loongson2e -mabi=32 -pipe -mplt"
 
-class arch_loongson2e_n32(generic_mipsel):
+class arch_loongson2e_n32(generic_mips64el):
 	"Builder class for all Loongson 2E [Little-endian N32]"
 	def __init__(self,myspec):
-		generic_mipsel.__init__(self,myspec)
+		generic_mips64el.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -march=loongson2e -mabi=n32 -pipe -mplt"
-		self.settings["CHOST"]="mips64el-unknown-linux-gnu"
 		self.settings["HOSTUSE"]=["n32"]
 
 class arch_loongson2f(generic_mipsel):
@@ -106,26 +114,24 @@ class arch_loongson2f(generic_mipsel):
 		generic_mipsel.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O3 -march=loongson2f -mabi=32 -pipe -mplt -Wa,-mfix-loongson2f-nop"
 
-class arch_loongson2f_n32(generic_mipsel):
+class arch_loongson2f_n32(generic_mips64el):
 	"Builder class for all Loongson 2F [Little-endian N32]"
 	def __init__(self,myspec):
-		generic_mipsel.__init__(self,myspec)
+		generic_mips64el.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O3 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop"
-		self.settings["CHOST"]="mips64el-unknown-linux-gnu"
 		self.settings["HOSTUSE"]=["n32"]
 
-class arch_mipsel4(generic_mipsel):
+class arch_mipsel4(generic_mips64el):
 	"Builder class for all MIPS IV [Little-endian]"
 	def __init__(self,myspec):
-		generic_mipsel.__init__(self,myspec)
+		generic_mips64el.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -mips4 -mabi=32 -pipe"
 
-class arch_mipsel4_n32(generic_mipsel):
+class arch_mipsel4_n32(generic_mips64el):
 	"Builder class for all MIPS IV [Little-endian N32]"
 	def __init__(self,myspec):
-		generic_mipsel.__init__(self,myspec)
+		generic_mips64el.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -mips4 -mabi=n32 -pipe"
-		self.settings["CHOST"]="mips64el-unknown-linux-gnu"
 		self.settings["HOSTUSE"]=["n32"]
 
 class arch_cobalt(generic_mipsel):
@@ -133,13 +139,12 @@ class arch_cobalt(generic_mipsel):
 	def __init__(self,myspec):
 		generic_mipsel.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -march=r5000 -mabi=32 -pipe"
-		self.settings["CHOST"]="mipsel-unknown-linux-gnu"
 		self.settings["HOSTUSE"]=["cobalt"]
 
-class arch_cobalt_n32(generic_mipsel):
+class arch_cobalt_n32(generic_mips64el):
 	"Builder class for all cobalt [Little-endian N32]"
 	def __init__(self,myspec):
-		arch_mipsel4_n32.__init__(self,myspec)
+		generic_mips64el.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -march=r5000 -mabi=n32 -pipe"
 		self.settings["HOSTUSE"]=["cobalt","n32"]
 

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

[Matt Turner]

commit:     17885f299c767166c95698bb920bd30fcee6dfcf
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 16:22:22 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Jun 25 16:22:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=17885f29

mips.py: fix CFLAGS in loongson class

Clearly never tested

---
 ChangeLog    |    3 +++
 arch/mips.py |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1d9b01d..9578cca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
 # $Id$
 
   25 Jun 2011; Matt Turner <mattst88@gentoo.org>
+  modules/catalyst/arch/mips.py: fix CFLAGS in loongson class
+
+  25 Jun 2011; Matt Turner <mattst88@gentoo.org>
   modules/catalyst/arch/mips.py: Remove ip* classes
 
   25 Jun 2011; Matt Turner <mattst88@gentoo.org>

diff --git a/arch/mips.py b/arch/mips.py
index 9dbd23b..e8107be 100644
--- a/arch/mips.py
+++ b/arch/mips.py
@@ -104,7 +104,7 @@ class arch_loongson2f(generic_mipsel):
 	"Builder class for all Loongson 2F [Little-endian]"
 	def __init__(self,myspec):
 		generic_mipsel.__init__(self,myspec)
-		self.settings["CFLAGS"]="-O3 -march=loongson2f -mabi=32 -pipe -mplt --Wa,-mfix-loongson2f-nop"
+		self.settings["CFLAGS"]="-O3 -march=loongson2f -mabi=32 -pipe -mplt -Wa,-mfix-loongson2f-nop"
 
 class arch_loongson2f_n32(generic_mipsel):
 	"Builder class for all Loongson 2F [Little-endian N32]"

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

[Matt Turner]

commit:     c3ed8934ddf6e676b067a62ccb86b1c328d00cc3
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 16:23:45 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Jun 25 16:23:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=c3ed8934

mips.py: remove n32/n64 USE flags

Nothing uses these flags anymore

---
 ChangeLog    |    3 +++
 arch/mips.py |   10 +---------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a953663..66da2a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
 # $Id$
 
   25 Jun 2011; Matt Turner <mattst88@gentoo.org>
+  modules/catalyst/arch/mips.py: remove n32/n64 USE flags
+
+  25 Jun 2011; Matt Turner <mattst88@gentoo.org>
   modules/catalyst/arch/mips.py: create generic mips64 classes
   and inherit from them to simplify other classes
 

diff --git a/arch/mips.py b/arch/mips.py
index 794ee91..ea61675 100644
--- a/arch/mips.py
+++ b/arch/mips.py
@@ -47,14 +47,12 @@ class arch_mips3_n32(generic_mips64):
 	def __init__(self,myspec):
 		generic_mips64.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -mips3 -mabi=n32 -pipe"
-		self.settings["HOSTUSE"]=["n32"]
 
 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 -mips3 -mabi=64 -pipe"
-		self.settings["HOSTUSE"]=["n64"]
 
 class arch_mips4(generic_mips64):
 	"Builder class for MIPS IV [Big-endian]"
@@ -67,14 +65,12 @@ class arch_mips4_n32(generic_mips64):
 	def __init__(self,myspec):
 		generic_mips64.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -mips4 -mabi=n32 -pipe"
-		self.settings["HOSTUSE"]=["n32"]
 
 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 -mips4 -mabi=64 -pipe"
-		self.settings["HOSTUSE"]=["n64"]
 
 class arch_mipsel1(generic_mipsel):
 	"Builder class for all MIPS I [Little-endian]"
@@ -93,7 +89,6 @@ class arch_mipsel3_n32(generic_mips64el):
 	def __init__(self,myspec):
 		generic_mips64el.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -mips3 -mabi=n32 -pipe"
-		self.settings["HOSTUSE"]=["n32"]
 
 class arch_loongson2e(generic_mipsel):
 	"Builder class for all Loongson 2E [Little-endian]"
@@ -106,7 +101,6 @@ class arch_loongson2e_n32(generic_mips64el):
 	def __init__(self,myspec):
 		generic_mips64el.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -march=loongson2e -mabi=n32 -pipe -mplt"
-		self.settings["HOSTUSE"]=["n32"]
 
 class arch_loongson2f(generic_mipsel):
 	"Builder class for all Loongson 2F [Little-endian]"
@@ -119,7 +113,6 @@ class arch_loongson2f_n32(generic_mips64el):
 	def __init__(self,myspec):
 		generic_mips64el.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O3 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop"
-		self.settings["HOSTUSE"]=["n32"]
 
 class arch_mipsel4(generic_mips64el):
 	"Builder class for all MIPS IV [Little-endian]"
@@ -132,7 +125,6 @@ class arch_mipsel4_n32(generic_mips64el):
 	def __init__(self,myspec):
 		generic_mips64el.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -mips4 -mabi=n32 -pipe"
-		self.settings["HOSTUSE"]=["n32"]
 
 class arch_cobalt(generic_mipsel):
 	"Builder class for all cobalt [Little-endian]"
@@ -146,7 +138,7 @@ class arch_cobalt_n32(generic_mips64el):
 	def __init__(self,myspec):
 		generic_mips64el.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -march=r5000 -mabi=n32 -pipe"
-		self.settings["HOSTUSE"]=["cobalt","n32"]
+		self.settings["HOSTUSE"]=["cobalt"]
 
 def register():
 	"Inform main catalyst program of the contents of this plugin."

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

[Matt Turner]

commit:     6f5a3aca8cce4475d4c3df940feac7de7e1e7866
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 16:24:21 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Jun 25 16:24:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=6f5a3aca

mips.py: add multilib (and missing n64) classes

---
 ChangeLog    |    3 +++
 arch/mips.py |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 66da2a4..70681df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
 # $Id$
 
   25 Jun 2011; Matt Turner <mattst88@gentoo.org>
+  modules/catalyst/arch/mips.py: add multilib (and missing n64) classes
+
+  25 Jun 2011; Matt Turner <mattst88@gentoo.org>
   modules/catalyst/arch/mips.py: remove n32/n64 USE flags
 
   25 Jun 2011; Matt Turner <mattst88@gentoo.org>

diff --git a/arch/mips.py b/arch/mips.py
index ea61675..a83dd17 100644
--- a/arch/mips.py
+++ b/arch/mips.py
@@ -30,6 +30,12 @@ class generic_mips64el(builder.generic):
 		self.settings["CHROOT"]="chroot"
 		self.settings["CHOST"]="mips64el-unknown-linux-gnu"
 
+class generic_multilib(builder.generic):
+	"Abstract base class for MIPS multilib"
+	def __init__(self,myspec):
+		builder.generic.__init__(self,myspec)
+		self.settings["HOSTUSE"]=["multilib"]
+
 class arch_mips1(generic_mips):
 	"Builder class for MIPS I [Big-endian]"
 	def __init__(self,myspec):
@@ -54,6 +60,13 @@ class arch_mips3_n64(generic_mips64):
 		generic_mips64.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -mips3 -mabi=64 -pipe"
 
+class arch_mips3_multilib(generic_mips64,generic_multilib):
+	"Builder class for MIPS III [Big-endian multilib]"
+	def __init__(self,myspec):
+		generic_mips64.__init__(self,myspec)
+		generic_multilib.__init__(self,myspec)
+		self.settings["CFLAGS"]="-O2 -mips3 -pipe"
+
 class arch_mips4(generic_mips64):
 	"Builder class for MIPS IV [Big-endian]"
 	def __init__(self,myspec):
@@ -72,6 +85,13 @@ class arch_mips4_n64(generic_mips64):
 		generic_mips64.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -mips4 -mabi=64 -pipe"
 
+class arch_mips4_multilib(generic_mips64,generic_multilib):
+	"Builder class for MIPS IV [Big-endian multilib]"
+	def __init__(self,myspec):
+		generic_mips64.__init__(self,myspec)
+		generic_multilib.__init__(self,myspec)
+		self.settings["CFLAGS"]="-O2 -mips4 -pipe"
+
 class arch_mipsel1(generic_mipsel):
 	"Builder class for all MIPS I [Little-endian]"
 	def __init__(self,myspec):
@@ -90,6 +110,19 @@ class arch_mipsel3_n32(generic_mips64el):
 		generic_mips64el.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -mips3 -mabi=n32 -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 -mips3 -mabi=64 -pipe"
+
+class arch_mipsel3_multilib(generic_mips64el,generic_multilib):
+	"Builder class for MIPS III [Little-endian multilib]"
+	def __init__(self,myspec):
+		generic_mips64el.__init__(self,myspec)
+		generic_multilib.__init__(self,myspec)
+		self.settings["CFLAGS"]="-O2 -mips3 -pipe"
+
 class arch_loongson2e(generic_mipsel):
 	"Builder class for all Loongson 2E [Little-endian]"
 	def __init__(self,myspec):
@@ -126,6 +159,19 @@ class arch_mipsel4_n32(generic_mips64el):
 		generic_mips64el.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -mips4 -mabi=n32 -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 -mips4 -mabi=64 -pipe"
+
+class arch_mipsel4_multilib(generic_mips64el,generic_multilib):
+	"Builder class for MIPS IV [Little-endian multilib]"
+	def __init__(self,myspec):
+		generic_mips64el.__init__(self,myspec)
+		generic_multilib.__init__(self,myspec)
+		self.settings["CFLAGS"]="-O2 -mips4 -pipe"
+
 class arch_cobalt(generic_mipsel):
 	"Builder class for all cobalt [Little-endian]"
 	def __init__(self,myspec):
@@ -150,14 +196,21 @@ def register():
 			"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,
 			"mipsel"		: arch_mipsel1,
 			"mipsel1"		: arch_mipsel1,
 			"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,
 			"loongson2e"		: arch_loongson2e,
 			"loongson2e_n32"	: arch_loongson2e_n32,
 			"loongson2f"		: arch_loongson2f,

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

[Raúl Porcel]

commit:     b3561349d8d6d366c8cfd4fa1cdcb0515a3e65ae
Author:     Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Thu May  3 18:59:26 2012 +0000
Commit:     Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Thu May  3 18:59:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=b3561349

Add armv6j_hardfp

---
 ChangeLog   |    5 ++++-
 arch/arm.py |    8 ++++++++
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b6df4d5..59ce6e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
 # ChangeLog for catalyst
-# Copyright 1999-2011 Gentoo Foundation; 2008-2011 Various authors (see AUTHORS)
+# Copyright 1999-2012 Gentoo Foundation; 2008-2011 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 # $Id$
 
+  03 May 2012; Raúl Porcel <armin76@gentoo.org> arch/arm.py:
+  Add armv6j_hardfp
+
   26 Jun 2011; Matt Turner <mattst88@gentoo.org>
   targets/support/chroot-functions.sh:
   Don't run 'distcc-config --install'

diff --git a/arch/arm.py b/arch/arm.py
index 5fff445..d476cb0 100644
--- a/arch/arm.py
+++ b/arch/arm.py
@@ -91,6 +91,13 @@ class arch_armv7a(generic_arm):
 		self.settings["CHOST"]="armv7a-unknown-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):
@@ -118,6 +125,7 @@ def register():
 		"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