[gentoo-commits] catalyst r1277 - in trunk: . arch

[Chris Gianelloni (wolf31o2)]

Author: wolf31o2
Date: 2008-02-06 22:45:22 +0000 (Wed, 06 Feb 2008)
New Revision: 1277

Modified:
   trunk/ChangeLog
   trunk/arch/ppc64.py
Log:
Added a patch from Markus Rothe <corsair@g.o> to add power6 and cell subarches to ppc64 for bug #208860 and removing redundant CXXFLAGS settings, since catalyst sets CXXFLAGS=CFLAGS by default.

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-02-06 22:16:41 UTC (rev 1276)
+++ trunk/ChangeLog	2008-02-06 22:45:22 UTC (rev 1277)
@@ -1,6 +1,11 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  06 Feb 2008; Chris Gianelloni <wolf31o2@g.o> arch/ppc64.py:
+  Added a patch from Markus Rothe <corsair@g.o> to add power6 and cell
+  subarches to ppc64 for bug #208860 and removing redundant CXXFLAGS settings,
+  since catalyst sets CXXFLAGS=CFLAGS by default.
+
   06 Feb 2008; Chris Gianelloni <wolf31o2@g.o>
   targets/livecd-stage1/livecd-stage1-chroot.sh, targets/support/kmerge.sh:
   Added clst_HOSTUSE to livecd-stage1 and livecd-stage2 package builds.

Modified: trunk/arch/ppc64.py
===================================================================
--- trunk/arch/ppc64.py	2008-02-06 22:16:41 UTC (rev 1276)
+++ trunk/arch/ppc64.py	2008-02-06 22:45:22 UTC (rev 1277)
@@ -8,45 +8,61 @@
 		self.settings["CHROOT"]="chroot"
 
 class arch_ppc64(generic_ppc64):
-	"builder class for generic ppc64 (G5/Power4/Power5)"
+	"builder class for generic ppc64"
 	def __init__(self,myspec):
 		generic_ppc64.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -pipe"
-		self.settings["CXXFLAGS"]="-O2 -pipe"
 		self.settings["CHOST"]="powerpc64-unknown-linux-gnu"
 
 class arch_970(arch_ppc64):
-	"builder class for G5 under ppc64"
+	"builder class for 970 aka G5 under ppc64"
 	def __init__(self,myspec):
 		arch_ppc64.__init__(self,myspec)
-		self.settings["CFLAGS"]="-O2 -pipe -mcpu=970 -mtune=970 -mabi=altivec"
-		self.settings["CXXFLAGS"]="-O2 -pipe -mcpu=970 -mtune=970 -mabi=altivec"
+		self.settings["CFLAGS"]="-O2 -pipe -mcpu=970 -mtune=970"
 		self.settings["HOSTUSE"]=["altivec"]
 
+class arch_cell(arch_ppc64):
+	"builder class for cell under ppc64"
+	def __init__(self,myspec):
+		arch_ppc64.__init__(self,myspec)
+		self.settings["CFLAGS"]="-O2 -pipe -mcpu=cell -mtune=cell"
+		self.settings["HOSTUSE"]=["altivec"]
+
 class arch_power3(arch_ppc64):
 	"builder class for power3 under ppc64"
 	def __init__(self,myspec):
 		arch_ppc64.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -pipe -mcpu=power3 -mtune=power3"
-		self.settings["CXXFLAGS"]="-O2 -pipe -mcpu=power3 -mtune=power3"
 
 class arch_power4(arch_ppc64):
 	"builder class for power4 under ppc64"
 	def __init__(self,myspec):
 		arch_ppc64.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -pipe -mcpu=power4 -mtune=power4"
-		self.settings["CXXFLAGS"]="-O2 -pipe -mcpu=power4 -mtune=power4"
 
 class arch_power5(arch_ppc64):
 	"builder class for power5 under ppc64"
 	def __init__(self,myspec):
 		arch_ppc64.__init__(self,myspec)
 		self.settings["CFLAGS"]="-O2 -pipe -mcpu=power5 -mtune=power5"
-		self.settings["CXXFLAGS"]="-O2 -pipe -mcpu=power5 -mtune=power5"
 
+class arch_power6(arch_ppc64):
+	"builder class for power6 under ppc64"
+	def __init__(self,myspec):
+		arch_ppc64.__init__(self,myspec)
+		self.settings["CFLAGS"]="-O2 -pipe -mcpu=power6 -mtune=power6"
+		self.settings["HOSTUSE"]=["altivec"]
+
 def register():
 	"Inform main catalyst program of the contents of this plugin."
-	return ({"ppc64":arch_ppc64,"970":arch_970,"power3":arch_power3,"power4":arch_power4,"power5":arch_power5},
-	("ppc64","powerpc64"))
+	return ({
+		"ppc64":	arch_ppc64,
+		"970":		arch_970,
+		"cell":		arch_cell,
+		"power3":	arch_power3,
+		"power4":	arch_power4,
+		"power5":	arch_power5,
+		"power6":	arch_power6
+	}, ("ppc64","powerpc64"))
 
 

-- 
gentoo-commits@l.g.o mailing list