diff options
author | 2005-07-23 17:34:48 +0000 | |
---|---|---|
committer | 2005-07-23 17:34:48 +0000 | |
commit | 9141df73e8dafc83d93dd017737422607c8ff9cf (patch) | |
tree | 4197aaae4d5b94b54e1918e2699f39c147adc3ef | |
parent | Forcing nodoc, noman, and noinfo into FEATURES for stage2, to reduce size. T... (diff) | |
download | gentoo-9141df73e8dafc83d93dd017737422607c8ff9cf.tar.gz gentoo-9141df73e8dafc83d93dd017737422607c8ff9cf.tar.bz2 gentoo-9141df73e8dafc83d93dd017737422607c8ff9cf.zip |
Updated ppc*.py with updates from Daniel Ostrow <dostrow@gentoo.org>.
-rw-r--r-- | src/catalyst/AUTHORS | 1 | ||||
-rw-r--r-- | src/catalyst/ChangeLog | 6 | ||||
-rw-r--r-- | src/catalyst/arch/ppc.py | 120 | ||||
-rw-r--r-- | src/catalyst/arch/ppc64.py | 71 |
4 files changed, 109 insertions, 89 deletions
diff --git a/src/catalyst/AUTHORS b/src/catalyst/AUTHORS index cdb960c1e6..9baeca29db 100644 --- a/src/catalyst/AUTHORS +++ b/src/catalyst/AUTHORS @@ -13,3 +13,4 @@ Eric Edgar <rocket@gentoo.org> Gustavo Zacarias <gustavoz@gentoo.org> Robert Paskowitz <r2d2@gentoo.org> David Bryson <mutex@gentoo.org> +Daniel Ostrow <dostrow@gentoo.org> diff --git a/src/catalyst/ChangeLog b/src/catalyst/ChangeLog index 9f2607951d..146b153c9a 100644 --- a/src/catalyst/ChangeLog +++ b/src/catalyst/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.115 2005/07/21 15:02:32 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.116 2005/07/23 17:34:48 wolf31o2 Exp $ + + 23 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> AUTHORS, arch/ppc.py, + arch/ppc64.py: + Updated ppc*.py with updates from Daniel Ostrow <dostrow@gentoo.org>. 21 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, targets/stage2/stage2-chroot.sh: diff --git a/src/catalyst/arch/ppc.py b/src/catalyst/arch/ppc.py index 7a44ba5e7a..10a8be6a10 100644 --- a/src/catalyst/arch/ppc.py +++ b/src/catalyst/arch/ppc.py @@ -1,64 +1,56 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/arch/Attic/ppc.py,v 1.12.2.3 2005/07/06 22:07:18 wolf31o2 Exp $ - -import os,builder -from catalyst_support import * - -# gcc-3.3.3 required to do G5 optimizations -# install a 32bit kernel personality changer (that works) before building on a ppc64 host -# new gcc optimization feature requires -fno-strict-aliasing needed, otherwise code complains -# use the experimental thing for nptl builds - -class generic_ppc(builder.generic): - "abstract base class for all ppc builders" - def __init__(self,myspec): - builder.generic.__init__(self,myspec) - self.settings["mainarch"]="ppc" - self.settings["CHOST"]="powerpc-unknown-linux-gnu" - if self.settings["hostarch"]=="ppc64": - if not os.path.exists("/usr/bin/linux32"): - raise CatalystError,"required /usr/bin/linux32 executable not found." - self.settings["CHROOT"]="/usr/bin/linux32 chroot" - else: - self.settings["CHROOT"]="chroot" - -class arch_power_ppc(generic_ppc): - "builder class for generic powerpc/power" - def __init__(self,myspec): - generic_ppc.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mtune=common -fno-strict-aliasing -pipe" - -class arch_ppc(generic_ppc): - "builder class for generic powerpc" - def __init__(self,myspec): - generic_ppc.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mtune=powerpc -fno-strict-aliasing -pipe" - -class arch_power(generic_ppc): - "builder class for generic power" - def __init__(self,myspec): - generic_ppc.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mtune=power -fno-strict-aliasing -pipe" - -class arch_g3(generic_ppc): - def __init__(self,myspec): - generic_ppc.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mtune=G3 -fno-strict-aliasing -pipe" - -class arch_g4(generic_ppc): - def __init__(self,myspec): - generic_ppc.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mtune=G4 -maltivec -mabi=altivec -fno-strict-aliasing -pipe" - self.settings["HOSTUSE"]=["altivec"] - -class arch_g5(generic_ppc): - def __init__(self,myspec): - generic_ppc.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mtune=G5 -maltivec -mabi=altivec -fno-strict-aliasing -pipe" - self.settings["HOSTUSE"]=["altivec"] - -def register(foo): - "Inform main catalyst program of the contents of this plugin." - foo.update({"ppc":arch_ppc,"power":arch_power,"power-ppc":arch_power_ppc,"g3":arch_g3,"g4":arch_g4,"g5":arch_g5}) - +# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo/src/catalyst/arch/Attic/ppc.py,v 1.12.2.4 2005/07/23 17:34:48 wolf31o2 Exp $
+
+import os,builder
+from catalyst_support import *
+
+# install a 32bit kernel personality changer (that works) before building on a ppc64 host
+# use the experimental thing for nptl builds
+
+class generic_ppc(builder.generic):
+ "abstract base class for all ppc builders"
+ def __init__(self,myspec):
+ builder.generic.__init__(self,myspec)
+ self.settings["mainarch"]="ppc"
+ self.settings["CHOST"]="powerpc-unknown-linux-gnu"
+ if self.settings["hostarch"]=="ppc64":
+ if not os.path.exists("/usr/bin/linux32"):
+ raise CatalystError,"required /usr/bin/linux32 executable not found."
+ self.settings["CHROOT"]="/usr/bin/linux32 chroot"
+ else:
+ self.settings["CHROOT"]="chroot"
+
+class arch_power_ppc(generic_ppc):
+ "builder class for generic powerpc/power"
+ def __init__(self,myspec):
+ generic_ppc.__init__(self,myspec)
+ self.settings["CFLAGS"]="-O2 -mtune=common -pipe"
+
+class arch_ppc(generic_ppc):
+ "builder class for generic powerpc"
+ def __init__(self,myspec):
+ generic_ppc.__init__(self,myspec)
+ self.settings["CFLAGS"]="-O2 -mtune=powerpc -pipe"
+
+class arch_power(generic_ppc):
+ "builder class for generic power"
+ def __init__(self,myspec):
+ generic_ppc.__init__(self,myspec)
+ self.settings["CFLAGS"]="-O2 -mtune=power -pipe"
+
+class arch_g3(generic_ppc):
+ def __init__(self,myspec):
+ generic_ppc.__init__(self,myspec)
+ self.settings["CFLAGS"]="-O2 -mtune=G3 -mcpu=G3 -pipe"
+
+class arch_g4(generic_ppc):
+ def __init__(self,myspec):
+ generic_ppc.__init__(self,myspec)
+ self.settings["CFLAGS"]="-O2 -mtune=G4 -mcpu=G4 -mabi=altivec -pipe"
+ self.settings["HOSTUSE"]=["altivec"]
+
+def register(foo):
+ "Inform main catalyst program of the contents of this plugin."
+ foo.update({"ppc":arch_ppc,"power":arch_power,"power-ppc":arch_power_ppc,"g3":arch_g3,"g4":arch_g4})
+
diff --git a/src/catalyst/arch/ppc64.py b/src/catalyst/arch/ppc64.py index e30bcfbe64..459427febb 100644 --- a/src/catalyst/arch/ppc64.py +++ b/src/catalyst/arch/ppc64.py @@ -1,24 +1,47 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/arch/Attic/ppc64.py,v 1.2.2.1 2005/07/05 21:47:46 wolf31o2 Exp $ - -import builder - -class generic_ppc64(builder.generic): - "abstract base class for all ppc64 builders" - def __init__(self,myspec): - builder.generic.__init__(self,myspec) - self.settings["mainarch"]="ppc64" - self.settings["CHROOT"]="chroot" - -class arch_ppc64(generic_ppc64): - "builder class for generic ppc64 (G5/Power4/Power4+)" - def __init__(self,myspec): - generic_ppc64.__init__(self,myspec) - self.settings["CFLAGS"]="-O2" - self.settings["CHOST"]="powerpc64-unknown-linux-gnu" - -def register(foo): - "Inform main catalyst program of the contents of this plugin." - foo.update({"ppc64":arch_ppc64}) - +# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo/src/catalyst/arch/Attic/ppc64.py,v 1.2.2.2 2005/07/23 17:34:48 wolf31o2 Exp $
+
+import builder
+
+class generic_ppc64(builder.generic):
+ "abstract base class for all ppc64 builders"
+ def __init__(self,myspec):
+ builder.generic.__init__(self,myspec)
+ self.settings["mainarch"]="ppc64"
+ self.settings["CHROOT"]="chroot"
+
+class arch_ppc64(generic_ppc64):
+ "builder class for generic ppc64 (G5/Power4/Power4+)"
+ def __init__(self,myspec):
+ generic_ppc64.__init__(self,myspec)
+ self.settings["CFLAGS"]="-O2 -pipe"
+ self.settings["CHOST"]="powerpc64-unknown-linux-gnu"
+
+class arch_970(generic_ppc64):
+ "builder class for G5 ppc64"
+ def __init__(self,myspec):
+ generic_ppc64.__init__(self,myspec)
+ self.settings["CFLAGS"]="-O2 -mtune=970 -mcpu=970 -mabi=altivec -pipe"
+ self.settings["HOSTUSE"]=["altivec"]
+ self.settings["CHOST"]="powerpc64-unknown-linux-gnu"
+
+class arch_ppc64_32(generic_ppc64):
+ "builder class for generic ppc64 with a 32bit userland (G5/Power4/Power4+)"
+ def __init__(self,myspec):
+ generic_ppc64.__init__(self,myspec)
+ self.settings["CFLAGS"]="-O2 -pipe"
+ self.settings["CHOST"]="powerpc-unknown-linux-gnu"
+
+class arch_970_32(generic_ppc64):
+ "builder class for G5 ppc64 with a 32bit userland"
+ def __init__(self,myspec):
+ generic_ppc64.__init__(self,myspec)
+ self.settings["CFLAGS"]="-O2 -mtune=970 -mcpu=970 -mabi=altivec -pipe"
+ self.settings["HOSTUSE"]=["altivec"]
+ self.settings["CHOST"]="powerpc-unknown-linux-gnu"
+
+def register(foo):
+ "Inform main catalyst program of the contents of this plugin."
+ foo.update({"ppc64-64ul":arch_ppc64,"G5-64ul":arch_970,"ppc64-32ul":arch_ppc64_32,"G5-32ul":arch_970_32})
+
|