Added s390x (64-bit) support via a patch from Mike Frysinger <vapier@gentoo.org>...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1226 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index a9d33d39a1a6b2e0723c17f749169fce0ec3a3ae..107fd521e4269e2e6bf8f55771ee4264d9729c5e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  10 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org> arch/s390.py:
+  Added s390x (64-bit) support via a patch from Mike Frysinger
+  <vapier@gentoo.org> for bug #173002.
+
   10 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/embedded/embedded-chroot.sh, targets/grp/grp-chroot.sh,
   targets/livecd-stage1/livecd-stage1-chroot.sh,

diff --git a/arch/s390.py b/arch/s390.py
index 21198157aff033837ba5ddd862d4e08223f7197d..bf22f668523405d43398aa0b3af2d547d4d4adc0 100644 (file)
--- a/arch/s390.py
+++ b/arch/s390.py
@@ -8,6 +8,12 @@ class generic_s390(builder.generic):
                builder.generic.__init__(self,myspec)
                self.settings["CHROOT"]="chroot"
 
+class generic_s390x(builder.generic):
+       "abstract base class for all s390x builders"
+       def __init__(self,myspec):
+               builder.generic.__init__(self,myspec)
+               self.settings["CHROOT"]="chroot"
+
 class arch_s390(generic_s390):
        "builder class for generic s390"
        def __init__(self,myspec):
@@ -15,6 +21,13 @@ class arch_s390(generic_s390):
                self.settings["CFLAGS"]="-O2 -pipe"
                self.settings["CHOST"]="s390-ibm-linux-gnu"
 
+class arch_s390x(generic_s390x):
+       "builder class for generic s390x"
+       def __init__(self,myspec):
+               generic_s390x.__init__(self,myspec)
+               self.settings["CFLAGS"]="-O2 -pipe"
+               self.settings["CHOST"]="s390x-ibm-linux-gnu"
+
 def register():
        "Inform main catalyst program of the contents of this plugin."
-       return ({"s390":arch_s390}, ("s390", ))
+       return ({"s390":arch_s390,"s390x":arch_s390x}, ("s390", "s390x"))