From 33d0469d15bda8bd926fe2c740e2f64d67745961 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 6 Feb 2008 22:45:22 +0000 Subject: [PATCH] Added a patch from Markus Rothe to add power6 and cell subarches to ppc64 for bug #208860 and removing redundant CXXFLAGS settings, since catalyst sets CXXFLAGS=CFLAGS by default. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1277 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 5 +++++ arch/ppc64.py | 36 ++++++++++++++++++++++++++---------- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d9311a7..1e72fadf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 06 Feb 2008; Chris Gianelloni arch/ppc64.py: + Added a patch from Markus Rothe 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 targets/livecd-stage1/livecd-stage1-chroot.sh, targets/support/kmerge.sh: Added clst_HOSTUSE to livecd-stage1 and livecd-stage2 package builds. diff --git a/arch/ppc64.py b/arch/ppc64.py index 4ef76e60..40750341 100644 --- a/arch/ppc64.py +++ b/arch/ppc64.py @@ -8,19 +8,24 @@ class generic_ppc64(builder.generic): 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): @@ -28,25 +33,36 @@ class arch_power3(arch_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")) -- 2.26.2