diff options
| -rw-r--r-- | src/catalyst/ChangeLog | 7 | ||||
| -rw-r--r-- | src/catalyst/arch/mips.py | 20 | ||||
| -rw-r--r-- | src/catalyst/arch/x86.py | 20 | ||||
| -rw-r--r-- | src/catalyst/modules/catalyst_support.py | 19 |
4 files changed, 37 insertions, 29 deletions
diff --git a/src/catalyst/ChangeLog b/src/catalyst/ChangeLog index c4286d3f29..e239d94cc8 100644 --- a/src/catalyst/ChangeLog +++ b/src/catalyst/ChangeLog @@ -1,6 +1,11 @@ # 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.73 2005/07/05 21:47:46 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.74 2005/07/06 18:49:56 wolf31o2 Exp $ + + 06 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> arch/mips.py, + arch/x86.py, modules/catalyst_support.py: + Added patch to fix None None bug and exception reporting. Removed + -fomit-frame-pointer from default CFLAGS, since it isn't necessary. 05 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> arch/alpha.py, arch/amd64.py, arch/hppa.py, arch/ia64.py, arch/mips.py, arch/ppc.py, diff --git a/src/catalyst/arch/mips.py b/src/catalyst/arch/mips.py index 637f9a0862..e3cd9825f1 100644 --- a/src/catalyst/arch/mips.py +++ b/src/catalyst/arch/mips.py @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/arch/Attic/mips.py,v 1.3.2.1 2005/07/05 21:47:46 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/arch/Attic/mips.py,v 1.3.2.2 2005/07/06 18:49:56 wolf31o2 Exp $ import builder,os from catalyst_support import * @@ -25,56 +25,56 @@ class arch_mips1(generic_mips): "Builder class for MIPS I [Big-endian]" def __init__(self,myspec): generic_mips.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mips1 -mabi=32 -fomit-frame-pointer" + self.settings["CFLAGS"]="-O2 -mips1 -mabi=32" 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 -fomit-frame-pointer" + self.settings["CFLAGS"]="-O2 -mips2 -mabi=32" class arch_mips3(generic_mips): "Builder class for MIPS III [Big-endian]" def __init__(self,myspec): generic_mips.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mips3 -mabi=32 -fomit-frame-pointer" + self.settings["CFLAGS"]="-O2 -mips3 -mabi=32" class arch_mips4(generic_mips): "Builder class for MIPS IV [Big-endian]" def __init__(self,myspec): generic_mips.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mips4 -mabi=32 -fomit-frame-pointer" + self.settings["CFLAGS"]="-O2 -mips4 -mabi=32" class arch_mips4n32(generic_mips): "Builder class for MIPS IV [Big-endian N32]" def __init__(self,myspec): generic_mips.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mips4 -mabi=n32 -fomit-frame-pointer" + self.settings["CFLAGS"]="-O2 -mips4 -mabi=n32" self.settings["CHOST"]="mips64-unknown-linux-gnu" class arch_mipsel1(generic_mipsel): "Builder class for all MIPS I [Little-endian]" def __init__(self,myspec): generic_mipsel.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mips1 -mabi=32 -fomit-frame-pointer" + self.settings["CFLAGS"]="-O2 -mips1 -mabi=32" 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 -fomit-frame-pointer" + self.settings["CFLAGS"]="-O2 -mips2 -mabi=32" class arch_mipsel3(generic_mipsel): "Builder class for all MIPS III [Little-endian]" def __init__(self,myspec): generic_mipsel.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mips3 -mabi=32 -fomit-frame-pointer" + self.settings["CFLAGS"]="-O2 -mips3 -mabi=32" class arch_mipsel4(generic_mipsel): "Builder class for all MIPS IV [Little-endian]" def __init__(self,myspec): generic_mipsel.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mips4 -mabi=32 -fomit-frame-pointer" + self.settings["CFLAGS"]="-O2 -mips4 -mabi=32" diff --git a/src/catalyst/arch/x86.py b/src/catalyst/arch/x86.py index 51958e9e4a..fa5a1b1991 100644 --- a/src/catalyst/arch/x86.py +++ b/src/catalyst/arch/x86.py @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/arch/Attic/x86.py,v 1.14.2.1 2005/07/05 21:47:46 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/arch/Attic/x86.py,v 1.14.2.2 2005/07/06 18:49:56 wolf31o2 Exp $ import builder,os from catalyst_support import * @@ -21,25 +21,25 @@ class arch_x86(generic_x86): "builder class for generic x86 (386+)" def __init__(self,myspec): generic_x86.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -mcpu=i686 -fomit-frame-pointer" + self.settings["CFLAGS"]="-O2 -mcpu=i686" self.settings["CHOST"]="i386-pc-linux-gnu" class arch_i386(generic_x86): def __init__(self,myspec): generic_x86.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -march=i386 -fomit-frame-pointer" + self.settings["CFLAGS"]="-O2 -march=i386" self.settings["CHOST"]="i386-pc-linux-gnu" class arch_i486(generic_x86): def __init__(self,myspec): generic_x86.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -march=i486 -fomit-frame-pointer" + self.settings["CFLAGS"]="-O2 -march=i486" self.settings["CHOST"]="i486-pc-linux-gnu" class arch_i586(generic_x86): def __init__(self,myspec): generic_x86.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -march=i586 -fomit-frame-pointer" + self.settings["CFLAGS"]="-O2 -march=i586" self.settings["CHOST"]="i586-pc-linux-gnu" class arch_pentium_mmx(arch_i586): @@ -50,13 +50,13 @@ class arch_pentium_mmx(arch_i586): class arch_i686(generic_x86): def __init__(self,myspec): generic_x86.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -march=i686 -fomit-frame-pointer" + self.settings["CFLAGS"]="-O2 -march=i686" self.settings["CHOST"]="i686-pc-linux-gnu" class arch_athlon(generic_x86): def __init__(self,myspec): generic_x86.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -march=athlon -fomit-frame-pointer" + self.settings["CFLAGS"]="-O2 -march=athlon" self.settings["CHOST"]="i686-pc-linux-gnu" self.settings["HOSTUSE"]=["mmx","3dnow"] @@ -64,21 +64,21 @@ class arch_athlon_xp(generic_x86): #this handles XP and MP processors def __init__(self,myspec): generic_x86.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -march=athlon-xp -fomit-frame-pointer" + self.settings["CFLAGS"]="-O2 -march=athlon-xp" self.settings["CHOST"]="i686-pc-linux-gnu" self.settings["HOSTUSE"]=["mmx","3dnow"] class arch_pentium4(generic_x86): def __init__(self,myspec): generic_x86.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -march=pentium4 -fomit-frame-pointer" + self.settings["CFLAGS"]="-O2 -march=pentium4" self.settings["CHOST"]="i686-pc-linux-gnu" self.settings["HOSTUSE"]=["mmx","sse"] class arch_pentium3(generic_x86): def __init__(self,myspec): generic_x86.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -march=pentium3 -fomit-frame-pointer" + self.settings["CFLAGS"]="-O2 -march=pentium3" self.settings["CHOST"]="i686-pc-linux-gnu" self.settings["HOSTUSE"]=["mmx","sse"] diff --git a/src/catalyst/modules/catalyst_support.py b/src/catalyst/modules/catalyst_support.py index 54ee15a9f9..06e42755ae 100644 --- a/src/catalyst/modules/catalyst_support.py +++ b/src/catalyst/modules/catalyst_support.py @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/catalyst_support.py,v 1.34.2.2 2005/07/05 21:47:46 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/catalyst_support.py,v 1.34.2.3 2005/07/06 18:49:56 wolf31o2 Exp $ import sys,string,os,types,re,traceback @@ -39,13 +39,16 @@ def list_bashify(mylist): return mypack class CatalystError(Exception): - def __init__(self, message): - if message: - print - print traceback.print_exc(file=sys.stdout) - print - print "!!! catalyst: "+message - print + def __init__(self, message): + if message: + (type,value)=sys.exc_info()[:2] + if value!=None: + print + print traceback.print_exc(file=sys.stdout) + print + print "!!! catalyst: "+message + print + def die(msg=None): warn(msg) |